summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2014-08-09 18:54:40 (GMT)
committerAlbert Astals Cid <aacid@kde.org>2014-08-09 18:54:40 (GMT)
commit26251d91a493a46eca9f11fdfca940d39575b8fd (patch)
treef144f8da8c3b0f0a32a2ea786aecf4f03ff8e0a2
parentefbde6600927ef41df5b7e139048202205d50404 (diff)
poppler-qt4 -> poppler-qt5
-rw-r--r--generators/poppler/annots.h2
-rw-r--r--generators/poppler/config-okular-poppler.h.cmake12
-rw-r--r--generators/poppler/formfields.cpp2
-rw-r--r--generators/poppler/generator_pdf.h4
-rw-r--r--generators/poppler/popplerembeddedfile.h2
5 files changed, 4 insertions, 18 deletions
diff --git a/generators/poppler/annots.h b/generators/poppler/annots.h
index 84dd802..bb7311a 100644
--- 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>
diff --git a/generators/poppler/config-okular-poppler.h.cmake b/generators/poppler/config-okular-poppler.h.cmake
index 1e8ff9e..17280e3 100644
--- 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
diff --git a/generators/poppler/formfields.cpp b/generators/poppler/formfields.cpp
index 53e50ed..fd1de5e 100644
--- 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>
diff --git a/generators/poppler/generator_pdf.h b/generators/poppler/generator_pdf.h
index 1a34bb7..27d3e08 100644
--- 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>
diff --git a/generators/poppler/popplerembeddedfile.h b/generators/poppler/popplerembeddedfile.h
index 2b2f634..1099a63 100644
--- 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>