[poppler] CMakeLists.txt qt5/CMakeLists.txt

[GitLab Mirror]

 CMakeLists.txt     |    2 +-
 qt5/CMakeLists.txt |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit b58d77e92a6e627427073703e9120b2a94bde011
Author: Albert Astals Cid <aacid at kde.org>
Date:   Thu Jun 4 17:12:46 2020 +0200

    qt5: make it clear we require Qt 5.5
    
    Also disable deprecated code until 5.5 and disable later warnings since
    we can't fix them since most of the times they require a Qt newer than
    5.5. We'll tackle them when we increase the minimum Qt version

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0838bf91..ae175807 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -149,7 +149,7 @@ else()
 endif()
 
 if (ENABLE_QT5)
-  find_package(Qt5Core)
+  find_package(Qt5Core 5.5)  # Update QT_DISABLE_DEPRECATED_BEFORE in qt5/CMakeLists.txt when increasing this
   find_package(Qt5Gui)
   find_package(Qt5Xml)
   find_package(Qt5Widgets)
diff --git a/qt5/CMakeLists.txt b/qt5/CMakeLists.txt
index 624ea643..58b42f5e 100644
--- a/qt5/CMakeLists.txt
+++ b/qt5/CMakeLists.txt
@@ -5,6 +5,9 @@ if(ENABLE_QT_STRICT_ITERATORS)
   add_definitions(-DQT_STRICT_ITERATORS)
 endif()
 
+add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050500)
+add_definitions(-DQT_NO_DEPRECATED_WARNINGS)
+
 add_subdirectory(src)
 add_subdirectory(tests)
 add_subdirectory(demos)