Restore compatibility with Poppler 0.5.x.

svn path=/trunk/playground/graphics/okular/; revision=637077

generators/poppler/CMakeLists.txt

@@ -7,7 +7,16 @@ include_directories(
 
 ########### next target ###############
 
-set(okularGenerator_poppler_PART_SRCS generator_pdf.cpp formfields.cpp )
+set(okularGenerator_poppler_PART_SRCS
+   generator_pdf.cpp
+)
+
+if (HAVE_POPPLER_HEAD)
+   set(okularGenerator_poppler_PART_SRCS
+      ${okularGenerator_poppler_PART_SRCS}
+      formfields.cpp
+   )
+endif (HAVE_POPPLER_HEAD)
 
 kde4_automoc(${okularGenerator_poppler_PART_SRCS})
 

generators/poppler/generator_pdf.cpp

@@ -34,11 +34,14 @@
 
 // local includes
 #include "generator_pdf.h"
-#include "formfields.h"
 #include "settings.h"
 
 #include <config-okular.h>
 
+#ifdef HAVE_POPPLER_HEAD
+#include "formfields.h"
+#endif
+
 class PDFEmbeddedFile : public Okular::EmbeddedFile
 {
     public:
@@ -1169,6 +1172,7 @@ void PDFGenerator::addTransition( Poppler::Page * pdfPage, Okular::Page * page )
 
 void PDFGenerator::addFormFields( Poppler::Page * popplerPage, Okular::Page * page )
 {
+#ifdef HAVE_POPPLER_HEAD
     QList<Poppler::FormField*> popplerFormFields = popplerPage->formFields();
     QLinkedList<Okular::FormField*> okularFormFields;
     foreach( Poppler::FormField *f, popplerFormFields )
@@ -1193,6 +1197,10 @@ void PDFGenerator::addFormFields( Poppler::Page * popplerPage, Okular::Page * pa
     }
     if ( !okularFormFields.isEmpty() )
         page->setFormFields( okularFormFields );
+#else
+    Q_UNUSED( popplerPage )
+    Q_UNUSED( page )
+#endif
 }
 
 struct pdfsyncpoint