From 26251d91a493a46eca9f11fdfca940d39575b8fd Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Sat, 9 Aug 2014 20:54:40 +0200
Subject: [PATCH] poppler-qt4 -> poppler-qt5

---
 generators/poppler/annots.h                      |  2 +-
 generators/poppler/config-okular-poppler.h.cmake | 12 ------------
 generators/poppler/formfields.cpp                |  2 +-
 generators/poppler/generator_pdf.h               |  4 +---
 generators/poppler/popplerembeddedfile.h         |  2 +-
 5 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/generators/poppler/annots.h b/generators/poppler/annots.h
index 84dd80204..bb7311a7a 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 1e8ff9ed3..17280e3ae 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 53e50ed3d..fd1de5e63 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 1a34bb79e..27d3e089c 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 2b2f63408..1099a6309 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>