poppler-qt4 -> poppler-qt5

12 years ago · 26251d91a4
parent efbde66009
commit 26251d91a4
5 changed files with 4 additions and 18 deletions
--- a/generators/poppler/annots.h
+++ b/generators/poppler/annots.h
@ -11,7 +11,7 @@
 #define _OKULAR_GENERATOR_PDF_ANNOTS_H_

 #include <poppler-annotation.h>
-#include <poppler-qt4.h>
+#include <poppler-qt5.h>

 #include <qmutex.h>

--- a/generators/poppler/config-okular-poppler.h.cmake
+++ b/generators/poppler/config-okular-poppler.h.cmake
@ -1,15 +1,3 @@
-/* Defined if we have the 0.12.1 version of the Poppler library */
-#cmakedefine HAVE_POPPLER_0_12_1 1
-
-/* Defined if we have the 0.16 version of the Poppler library */
-#cmakedefine HAVE_POPPLER_0_16 1
-
-/* Defined if we have the 0.20 version of the Poppler library */
-#cmakedefine HAVE_POPPLER_0_20 1
-
-/* Defined if we have the 0.22 version of the Poppler library */
-#cmakedefine HAVE_POPPLER_0_22 1
-
 /* Defined if we have the 0.24 version of the Poppler library */
 #cmakedefine HAVE_POPPLER_0_24 1

--- a/generators/poppler/formfields.cpp
+++ b/generators/poppler/formfields.cpp
@ -11,7 +11,7 @@

 #include "core/action.h"

-#include <poppler-qt4.h>
+#include <poppler-qt5.h>

 #include <config-okular-poppler.h>

--- a/generators/poppler/generator_pdf.h
+++ b/generators/poppler/generator_pdf.h
@ -11,11 +11,9 @@
 #ifndef _OKULAR_GENERATOR_PDF_H_
 #define _OKULAR_GENERATOR_PDF_H_

-#define UNSTABLE_POPPLER_QT4
-
 #include "synctex/synctex_parser.h"

-#include <poppler-qt4.h>
+#include <poppler-qt5.h>

 #include <qbitarray.h>
 #include <qpointer.h>
--- a/generators/poppler/popplerembeddedfile.h
+++ b/generators/poppler/popplerembeddedfile.h
@ -10,7 +10,7 @@
 #ifndef POPPLEREMBEDDEDFILE_H
 #define POPPLEREMBEDDEDFILE_H

-#include <poppler-qt4.h>
+#include <poppler-qt5.h>

 #include <core/document.h>