summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2020-06-04 17:12:46 +0200
committerAlbert Astals Cid <aacid@kde.org>2020-06-04 17:12:46 +0200
commitb58d77e92a6e627427073703e9120b2a94bde011 (patch)
tree2444789b8c266a94bbf9d44efca5ad8dae52be1e
parent6bf89c78447692ed781918b7cb3fadb21aa0cf89 (diff)
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
-rw-r--r--CMakeLists.txt2
-rw-r--r--qt5/CMakeLists.txt3
2 files changed, 4 insertions, 1 deletions
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)