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

---
 autotests/parttest.cpp                           |  3 ---
 generators/poppler/CMakeLists.txt                | 10 ----------
 generators/poppler/config-okular-poppler.h.cmake |  3 ---
 generators/poppler/formfields.cpp                |  4 ----
 4 files changed, 20 deletions(-)

diff --git a/autotests/parttest.cpp b/autotests/parttest.cpp
index bef28b387..0988b3e6b 100644
--- a/autotests/parttest.cpp
+++ b/autotests/parttest.cpp
@@ -1613,9 +1613,6 @@ static void verifyTargetStates(const QString &triggerName, const QMap<QString, O
 
 void PartTest::testAdditionalActionTriggers()
 {
-#ifndef HAVE_POPPLER_0_65
-    return;
-#endif
     const QString testFile = QStringLiteral(KDESRCDIR "data/additionalFormActions.pdf");
     Okular::Part part(nullptr, nullptr, QVariantList());
     part.openDocument(testFile);
diff --git a/generators/poppler/CMakeLists.txt b/generators/poppler/CMakeLists.txt
index 8a65b4429..c2a04db3b 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()
-{
-  Poppler::FormField *f = nullptr;
-  f->additionalAction(Poppler::Annotation::CursorEnteringAction);
-}
-" HAVE_POPPLER_0_65)
-
 check_cxx_source_compiles("
 #include <poppler-qt5.h>
 #include <poppler-form.h>
diff --git a/generators/poppler/config-okular-poppler.h.cmake b/generators/poppler/config-okular-poppler.h.cmake
index 3d34e8198..57839d958 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.65 version of the Poppler library */
-#cmakedefine HAVE_POPPLER_0_65 1
-
 /* Defined if we have the 0.68 version of the Poppler library */
 #cmakedefine HAVE_POPPLER_0_68 1
 
diff --git a/generators/poppler/formfields.cpp b/generators/poppler/formfields.cpp
index ded3f72bc..2c1590526 100644
--- a/generators/poppler/formfields.cpp
+++ b/generators/poppler/formfields.cpp
@@ -20,7 +20,6 @@
 #include <config-okular-poppler.h>
 
 extern Okular::Action *createLinkFromPopplerLink(const Poppler::Link *popplerLink, bool deletePopplerLink = true);
-#ifdef HAVE_POPPLER_0_65
 #define SET_ANNOT_ACTIONS                                                                                                                                                                                                                      \
     setAdditionalAction(Okular::Annotation::CursorEntering, createLinkFromPopplerLink(m_field->additionalAction(Poppler::Annotation::CursorEnteringAction)));                                                                                  \
     setAdditionalAction(Okular::Annotation::CursorLeaving, createLinkFromPopplerLink(m_field->additionalAction(Poppler::Annotation::CursorLeavingAction)));                                                                                    \
@@ -28,9 +27,6 @@ extern Okular::Action *createLinkFromPopplerLink(const Poppler::Link *popplerLin
     setAdditionalAction(Okular::Annotation::MouseReleased, createLinkFromPopplerLink(m_field->additionalAction(Poppler::Annotation::MouseReleasedAction)));                                                                                    \
     setAdditionalAction(Okular::Annotation::FocusIn, createLinkFromPopplerLink(m_field->additionalAction(Poppler::Annotation::FocusInAction)));                                                                                                \
     setAdditionalAction(Okular::Annotation::FocusOut, createLinkFromPopplerLink(m_field->additionalAction(Poppler::Annotation::FocusOutAction)));
-#else
-#define SET_ANNOT_ACTIONS
-#endif
 
 #define SET_ACTIONS                                                                                                                                                                                                                            \
     setActivationAction(createLinkFromPopplerLink(m_field->activationAction()));                                                                                                                                                               \