Commit 7dce3389 authored by Albert Astals Cid's avatar Albert Astals Cid
Browse files

Remove poppler 0.65 ifdefs since we require 0.86 now

parent c019a7e7
...@@ -1613,9 +1613,6 @@ static void verifyTargetStates(const QString &triggerName, const QMap<QString, O ...@@ -1613,9 +1613,6 @@ static void verifyTargetStates(const QString &triggerName, const QMap<QString, O
void PartTest::testAdditionalActionTriggers() void PartTest::testAdditionalActionTriggers()
{ {
#ifndef HAVE_POPPLER_0_65
return;
#endif
const QString testFile = QStringLiteral(KDESRCDIR "data/additionalFormActions.pdf"); const QString testFile = QStringLiteral(KDESRCDIR "data/additionalFormActions.pdf");
Okular::Part part(nullptr, nullptr, QVariantList()); Okular::Part part(nullptr, nullptr, QVariantList());
part.openDocument(testFile); part.openDocument(testFile);
......
...@@ -5,16 +5,6 @@ add_subdirectory( conf ) ...@@ -5,16 +5,6 @@ add_subdirectory( conf )
set(CMAKE_REQUIRED_LIBRARIES Poppler::Qt5 Qt5::Core Qt5::Gui) 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(" check_cxx_source_compiles("
#include <poppler-qt5.h> #include <poppler-qt5.h>
#include <poppler-form.h> #include <poppler-form.h>
......
/* 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 */ /* Defined if we have the 0.68 version of the Poppler library */
#cmakedefine HAVE_POPPLER_0_68 1 #cmakedefine HAVE_POPPLER_0_68 1
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <config-okular-poppler.h> #include <config-okular-poppler.h>
extern Okular::Action *createLinkFromPopplerLink(const Poppler::Link *popplerLink, bool deletePopplerLink = true); extern Okular::Action *createLinkFromPopplerLink(const Poppler::Link *popplerLink, bool deletePopplerLink = true);
#ifdef HAVE_POPPLER_0_65
#define SET_ANNOT_ACTIONS \ #define SET_ANNOT_ACTIONS \
setAdditionalAction(Okular::Annotation::CursorEntering, createLinkFromPopplerLink(m_field->additionalAction(Poppler::Annotation::CursorEnteringAction))); \ setAdditionalAction(Okular::Annotation::CursorEntering, createLinkFromPopplerLink(m_field->additionalAction(Poppler::Annotation::CursorEnteringAction))); \
setAdditionalAction(Okular::Annotation::CursorLeaving, createLinkFromPopplerLink(m_field->additionalAction(Poppler::Annotation::CursorLeavingAction))); \ setAdditionalAction(Okular::Annotation::CursorLeaving, createLinkFromPopplerLink(m_field->additionalAction(Poppler::Annotation::CursorLeavingAction))); \
...@@ -28,9 +27,6 @@ extern Okular::Action *createLinkFromPopplerLink(const Poppler::Link *popplerLin ...@@ -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::MouseReleased, createLinkFromPopplerLink(m_field->additionalAction(Poppler::Annotation::MouseReleasedAction))); \
setAdditionalAction(Okular::Annotation::FocusIn, createLinkFromPopplerLink(m_field->additionalAction(Poppler::Annotation::FocusInAction))); \ setAdditionalAction(Okular::Annotation::FocusIn, createLinkFromPopplerLink(m_field->additionalAction(Poppler::Annotation::FocusInAction))); \
setAdditionalAction(Okular::Annotation::FocusOut, createLinkFromPopplerLink(m_field->additionalAction(Poppler::Annotation::FocusOutAction))); setAdditionalAction(Okular::Annotation::FocusOut, createLinkFromPopplerLink(m_field->additionalAction(Poppler::Annotation::FocusOutAction)));
#else
#define SET_ANNOT_ACTIONS
#endif
#define SET_ACTIONS \ #define SET_ACTIONS \
setActivationAction(createLinkFromPopplerLink(m_field->activationAction())); \ setActivationAction(createLinkFromPopplerLink(m_field->activationAction())); \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment