From eacb5eed8be43c464af3b4dc6c3c9243779ed3c9 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Sun, 13 Sep 2020 01:12:05 +0200
Subject: [PATCH] Remove poppler 0.68 ifdefs since we require 0.86 now

---
 generators/poppler/CMakeLists.txt                | 10 ----------
 generators/poppler/config-okular-poppler.h.cmake |  3 ---
 generators/poppler/pdfsignatureutils.cpp         |  8 --------
 3 files changed, 21 deletions(-)

diff --git a/generators/poppler/CMakeLists.txt b/generators/poppler/CMakeLists.txt
index c2a04db3b..9e8711e9e 100644
--- a/generators/poppler/CMakeLists.txt
+++ b/generators/poppler/CMakeLists.txt
@@ -5,16 +5,6 @@ add_subdirectory( conf )
 
 set(CMAKE_REQUIRED_LIBRARIES Poppler::Qt5 Qt5::Core Qt5::Gui)
 
-check_cxx_source_compiles("
-#include <poppler-qt5.h>
-#include <poppler-form.h>
-int main()
-{
-  auto f = &Poppler::SignatureValidationInfo::reason;
-  (void)f;
-}
-" HAVE_POPPLER_0_68)
-
 check_cxx_source_compiles("
 #include <poppler-qt5.h>
 #include <QColor>
diff --git a/generators/poppler/config-okular-poppler.h.cmake b/generators/poppler/config-okular-poppler.h.cmake
index 57839d958..39c78dbcf 100644
--- a/generators/poppler/config-okular-poppler.h.cmake
+++ b/generators/poppler/config-okular-poppler.h.cmake
@@ -1,6 +1,3 @@
-/* Defined if we have the 0.68 version of the Poppler library */
-#cmakedefine HAVE_POPPLER_0_68 1
-
 /* Defined if we have the 0.69 version of the Poppler library */
 #cmakedefine HAVE_POPPLER_0_69 1
 
diff --git a/generators/poppler/pdfsignatureutils.cpp b/generators/poppler/pdfsignatureutils.cpp
index f364175e1..591d8fb86 100644
--- a/generators/poppler/pdfsignatureutils.cpp
+++ b/generators/poppler/pdfsignatureutils.cpp
@@ -220,20 +220,12 @@ QString PopplerSignatureInfo::signerSubjectDN() const
 
 QString PopplerSignatureInfo::location() const
 {
-#ifdef HAVE_POPPLER_0_68
     return m_info.location();
-#else
-    return {};
-#endif
 }
 
 QString PopplerSignatureInfo::reason() const
 {
-#ifdef HAVE_POPPLER_0_68
     return m_info.reason();
-#else
-    return {};
-#endif
 }
 
 QDateTime PopplerSignatureInfo::signingTime() const