From fb4c69d270a618bb23791e52f46ec73c86574294 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Fri, 1 Dec 2017 23:44:17 +0100
Subject: [PATCH] Remove the Qt4 frontend
---
.gitignore | 2 -
CMakeLists.txt | 17 -
cmake/modules/FindQt4.cmake | 1311 -------
poppler-qt4.pc.cmake | 12 -
qt4/.gitignore | 4 -
qt4/CMakeLists.txt | 6 -
qt4/demos/.gitignore | 4 -
qt4/demos/CMakeLists.txt | 28 -
qt4/demos/abstractinfodock.cpp | 57 -
qt4/demos/abstractinfodock.h | 48 -
qt4/demos/documentobserver.cpp | 50 -
qt4/demos/documentobserver.h | 50 -
qt4/demos/embeddedfiles.cpp | 82 -
qt4/demos/embeddedfiles.h | 44 -
qt4/demos/fonts.cpp | 72 -
qt4/demos/fonts.h | 43 -
qt4/demos/info.cpp | 72 -
qt4/demos/info.h | 43 -
qt4/demos/main_viewer.cpp | 33 -
qt4/demos/metadata.cpp | 50 -
qt4/demos/metadata.h | 43 -
qt4/demos/navigationtoolbar.cpp | 144 -
qt4/demos/navigationtoolbar.h | 65 -
qt4/demos/optcontent.cpp | 69 -
qt4/demos/optcontent.h | 47 -
qt4/demos/pageview.cpp | 101 -
qt4/demos/pageview.h | 53 -
qt4/demos/permissions.cpp | 66 -
qt4/demos/permissions.h | 43 -
qt4/demos/thumbnails.cpp | 84 -
qt4/demos/thumbnails.h | 48 -
qt4/demos/toc.cpp | 88 -
qt4/demos/toc.h | 43 -
qt4/demos/viewer.cpp | 319 --
qt4/demos/viewer.h | 73 -
qt4/src/.gitignore | 9 -
qt4/src/ArthurOutputDev.cc | 812 ----
qt4/src/ArthurOutputDev.h | 170 -
qt4/src/CMakeLists.txt | 54 -
qt4/src/Doxyfile | 1637 ---------
qt4/src/Mainpage.dox | 85 -
qt4/src/poppler-annotation-helper.h | 181 -
qt4/src/poppler-annotation-private.h | 112 -
qt4/src/poppler-annotation.cc | 5089 --------------------------
qt4/src/poppler-annotation.h | 1375 -------
qt4/src/poppler-base-converter.cc | 105 -
qt4/src/poppler-converter-private.h | 49 -
qt4/src/poppler-document.cc | 850 -----
qt4/src/poppler-embeddedfile-private.h | 42 -
qt4/src/poppler-embeddedfile.cc | 135 -
qt4/src/poppler-export.h | 20 -
qt4/src/poppler-fontinfo.cc | 150 -
qt4/src/poppler-form.cc | 416 ---
qt4/src/poppler-form.h | 343 --
qt4/src/poppler-link-extractor-private.h | 57 -
qt4/src/poppler-link-extractor.cc | 84 -
qt4/src/poppler-link-private.h | 57 -
qt4/src/poppler-link.cc | 710 ----
qt4/src/poppler-link.h | 641 ----
qt4/src/poppler-media.cc | 168 -
qt4/src/poppler-media.h | 100 -
qt4/src/poppler-movie.cc | 110 -
qt4/src/poppler-optcontent-private.h | 124 -
qt4/src/poppler-optcontent.cc | 456 ---
qt4/src/poppler-optcontent.h | 84 -
qt4/src/poppler-page-private.h | 57 -
qt4/src/poppler-page-transition-private.h | 28 -
qt4/src/poppler-page-transition.cc | 101 -
qt4/src/poppler-page-transition.h | 158 -
qt4/src/poppler-page.cc | 810 ----
qt4/src/poppler-pdf-converter.cc | 115 -
qt4/src/poppler-private.cc | 296 --
qt4/src/poppler-private.h | 241 --
qt4/src/poppler-ps-converter.cc | 280 --
qt4/src/poppler-qiodeviceoutstream-private.h | 47 -
qt4/src/poppler-qiodeviceoutstream.cc | 64 -
qt4/src/poppler-qt4.h | 1990 ----------
qt4/src/poppler-sound.cc | 132 -
qt4/src/poppler-textbox.cc | 63 -
qt4/tests/.gitignore | 33 -
qt4/tests/CMakeLists.txt | 67 -
qt4/tests/README.unittest | 23 -
qt4/tests/check_actualtext.cpp | 33 -
qt4/tests/check_attachments.cpp | 157 -
qt4/tests/check_dateConversion.cpp | 142 -
qt4/tests/check_fonts.cpp | 248 --
qt4/tests/check_goostring.cpp | 127 -
qt4/tests/check_lexer.cpp | 107 -
qt4/tests/check_links.cpp | 98 -
qt4/tests/check_metadata.cpp | 275 --
qt4/tests/check_optcontent.cpp | 446 ---
qt4/tests/check_pagelabelinfo.cpp | 43 -
qt4/tests/check_pagelayout.cpp | 49 -
qt4/tests/check_pagemode.cpp | 73 -
qt4/tests/check_password.cpp | 88 -
qt4/tests/check_permissions.cpp | 44 -
qt4/tests/check_search.cpp | 175 -
qt4/tests/check_strings.cpp | 250 --
qt4/tests/poppler-attachments.cpp | 39 -
qt4/tests/poppler-fonts.cpp | 89 -
qt4/tests/poppler-forms.cpp | 166 -
qt4/tests/poppler-texts.cpp | 40 -
qt4/tests/stress-poppler-dir.cpp | 67 -
qt4/tests/stress-poppler-qt4.cpp | 74 -
qt4/tests/stress-threads-qt4.cpp | 309 --
qt4/tests/test-password-qt4.cpp | 136 -
qt4/tests/test-poppler-qt4.cpp | 235 --
qt4/tests/test-render-to-file.cpp | 69 -
108 files changed, 25623 deletions(-)
delete mode 100644 cmake/modules/FindQt4.cmake
delete mode 100644 poppler-qt4.pc.cmake
delete mode 100644 qt4/.gitignore
delete mode 100644 qt4/CMakeLists.txt
delete mode 100644 qt4/demos/.gitignore
delete mode 100644 qt4/demos/CMakeLists.txt
delete mode 100644 qt4/demos/abstractinfodock.cpp
delete mode 100644 qt4/demos/abstractinfodock.h
delete mode 100644 qt4/demos/documentobserver.cpp
delete mode 100644 qt4/demos/documentobserver.h
delete mode 100644 qt4/demos/embeddedfiles.cpp
delete mode 100644 qt4/demos/embeddedfiles.h
delete mode 100644 qt4/demos/fonts.cpp
delete mode 100644 qt4/demos/fonts.h
delete mode 100644 qt4/demos/info.cpp
delete mode 100644 qt4/demos/info.h
delete mode 100644 qt4/demos/main_viewer.cpp
delete mode 100644 qt4/demos/metadata.cpp
delete mode 100644 qt4/demos/metadata.h
delete mode 100644 qt4/demos/navigationtoolbar.cpp
delete mode 100644 qt4/demos/navigationtoolbar.h
delete mode 100644 qt4/demos/optcontent.cpp
delete mode 100644 qt4/demos/optcontent.h
delete mode 100644 qt4/demos/pageview.cpp
delete mode 100644 qt4/demos/pageview.h
delete mode 100644 qt4/demos/permissions.cpp
delete mode 100644 qt4/demos/permissions.h
delete mode 100644 qt4/demos/thumbnails.cpp
delete mode 100644 qt4/demos/thumbnails.h
delete mode 100644 qt4/demos/toc.cpp
delete mode 100644 qt4/demos/toc.h
delete mode 100644 qt4/demos/viewer.cpp
delete mode 100644 qt4/demos/viewer.h
delete mode 100644 qt4/src/.gitignore
delete mode 100644 qt4/src/ArthurOutputDev.cc
delete mode 100644 qt4/src/ArthurOutputDev.h
delete mode 100644 qt4/src/CMakeLists.txt
delete mode 100644 qt4/src/Doxyfile
delete mode 100644 qt4/src/Mainpage.dox
delete mode 100644 qt4/src/poppler-annotation-helper.h
delete mode 100644 qt4/src/poppler-annotation-private.h
delete mode 100644 qt4/src/poppler-annotation.cc
delete mode 100644 qt4/src/poppler-annotation.h
delete mode 100644 qt4/src/poppler-base-converter.cc
delete mode 100644 qt4/src/poppler-converter-private.h
delete mode 100644 qt4/src/poppler-document.cc
delete mode 100644 qt4/src/poppler-embeddedfile-private.h
delete mode 100644 qt4/src/poppler-embeddedfile.cc
delete mode 100644 qt4/src/poppler-export.h
delete mode 100644 qt4/src/poppler-fontinfo.cc
delete mode 100644 qt4/src/poppler-form.cc
delete mode 100644 qt4/src/poppler-form.h
delete mode 100644 qt4/src/poppler-link-extractor-private.h
delete mode 100644 qt4/src/poppler-link-extractor.cc
delete mode 100644 qt4/src/poppler-link-private.h
delete mode 100644 qt4/src/poppler-link.cc
delete mode 100644 qt4/src/poppler-link.h
delete mode 100644 qt4/src/poppler-media.cc
delete mode 100644 qt4/src/poppler-media.h
delete mode 100644 qt4/src/poppler-movie.cc
delete mode 100644 qt4/src/poppler-optcontent-private.h
delete mode 100644 qt4/src/poppler-optcontent.cc
delete mode 100644 qt4/src/poppler-optcontent.h
delete mode 100644 qt4/src/poppler-page-private.h
delete mode 100644 qt4/src/poppler-page-transition-private.h
delete mode 100644 qt4/src/poppler-page-transition.cc
delete mode 100644 qt4/src/poppler-page-transition.h
delete mode 100644 qt4/src/poppler-page.cc
delete mode 100644 qt4/src/poppler-pdf-converter.cc
delete mode 100644 qt4/src/poppler-private.cc
delete mode 100644 qt4/src/poppler-private.h
delete mode 100644 qt4/src/poppler-ps-converter.cc
delete mode 100644 qt4/src/poppler-qiodeviceoutstream-private.h
delete mode 100644 qt4/src/poppler-qiodeviceoutstream.cc
delete mode 100644 qt4/src/poppler-qt4.h
delete mode 100644 qt4/src/poppler-sound.cc
delete mode 100644 qt4/src/poppler-textbox.cc
delete mode 100644 qt4/tests/.gitignore
delete mode 100644 qt4/tests/CMakeLists.txt
delete mode 100644 qt4/tests/README.unittest
delete mode 100644 qt4/tests/check_actualtext.cpp
delete mode 100644 qt4/tests/check_attachments.cpp
delete mode 100644 qt4/tests/check_dateConversion.cpp
delete mode 100644 qt4/tests/check_fonts.cpp
delete mode 100644 qt4/tests/check_goostring.cpp
delete mode 100644 qt4/tests/check_lexer.cpp
delete mode 100644 qt4/tests/check_links.cpp
delete mode 100644 qt4/tests/check_metadata.cpp
delete mode 100644 qt4/tests/check_optcontent.cpp
delete mode 100644 qt4/tests/check_pagelabelinfo.cpp
delete mode 100644 qt4/tests/check_pagelayout.cpp
delete mode 100644 qt4/tests/check_pagemode.cpp
delete mode 100644 qt4/tests/check_password.cpp
delete mode 100644 qt4/tests/check_permissions.cpp
delete mode 100644 qt4/tests/check_search.cpp
delete mode 100644 qt4/tests/check_strings.cpp
delete mode 100644 qt4/tests/poppler-attachments.cpp
delete mode 100644 qt4/tests/poppler-fonts.cpp
delete mode 100644 qt4/tests/poppler-forms.cpp
delete mode 100644 qt4/tests/poppler-texts.cpp
delete mode 100644 qt4/tests/stress-poppler-dir.cpp
delete mode 100644 qt4/tests/stress-poppler-qt4.cpp
delete mode 100644 qt4/tests/stress-threads-qt4.cpp
delete mode 100644 qt4/tests/test-password-qt4.cpp
delete mode 100644 qt4/tests/test-poppler-qt4.cpp
delete mode 100644 qt4/tests/test-render-to-file.cpp
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d753efe..2ed1398a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,6 @@ set (CMAKE_CXX_EXTENSIONS OFF)
# command line switches
option(ENABLE_XPDF_HEADERS "Install unsupported xpdf headers." OFF)
option(BUILD_GTK_TESTS "Whether compile the GTK+ test programs." ON)
-option(BUILD_QT4_TESTS "Whether compile the Qt4 test programs." ON)
option(BUILD_QT5_TESTS "Whether compile the Qt5 test programs." ON)
option(BUILD_CPP_TESTS "Whether compile the CPP test programs." ON)
option(ENABLE_SPLASH "Build the Splash graphics backend." ON)
@@ -48,7 +47,6 @@ option(ENABLE_UTILS "Compile poppler command line utils." ON)
option(ENABLE_CPP "Compile poppler cpp wrapper." ON)
option(ENABLE_GLIB "Compile poppler glib wrapper." ON)
option(ENABLE_GTK_DOC "Whether to generate glib API documentation." OFF)
-option(ENABLE_QT4 "Compile poppler qt4 wrapper." ON)
option(ENABLE_QT5 "Compile poppler qt5 wrapper." ON)
set(ENABLE_LIBOPENJPEG "openjpeg2" CACHE STRING "Use libopenjpeg for JPX streams. Possible values: openjpeg2, unmaintained, none. 'unmaintained' gives you the internal unmaintained decoder. Use at your own risk. 'none' compiles no JPX decoder at all. Default: openjpeg2")
set(ENABLE_CMS "lcms2" CACHE STRING "Use color management system. Possible values: lcms2, none. 'none' disables color management system.")
@@ -114,7 +112,6 @@ set(OPI_SUPPORT ON)
set(TEXTOUT_WORD_LIST ON)
# setting the minimum required versions for some components
-set(QT4_MIN_VERSION "4.7.0")
set(CAIRO_VERSION "1.10.0")
set(GLIB_REQUIRED "2.41")
@@ -144,13 +141,6 @@ else()
message(FATAL_ERROR "Invalid ENABLE_DCTDECODER value.")
endif()
-if (ENABLE_QT4)
- macro_optional_find_package(Qt4)
- if (NOT QT4_FOUND)
- set(ENABLE_QT4 OFF)
- endif()
-endif()
-
if (ENABLE_QT5)
find_package(Qt5Core)
find_package(Qt5Gui)
@@ -670,9 +660,6 @@ if(ENABLE_GLIB)
add_subdirectory(glib)
endif()
add_subdirectory(test)
-if(ENABLE_QT4)
- add_subdirectory(qt4)
-endif()
if(ENABLE_QT5)
add_subdirectory(qt5)
endif()
@@ -697,9 +684,6 @@ poppler_create_install_pkgconfig(poppler.pc ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
if(E
| 