aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2021-01-19 18:30:12 +0100
committerFriedrich W. H. Kossebau <kossebau@kde.org>2021-01-29 23:47:07 +0100
commitf8309d8d8d62fd10b809e2eef1076cac043f8f31 (patch)
tree114ccf82eb750439e40625c4ad2a453d1f4086c3
parente6b3345741e2824ae815ca9ccf17bc22044d55e8 (diff)
downloadextra-cmake-modules-f8309d8d8d62fd10b809e2eef1076cac043f8f31.tar.gz
extra-cmake-modules-f8309d8d8d62fd10b809e2eef1076cac043f8f31.tar.bz2
Define -DQT_NO_FOREACH by default
-rw-r--r--kde-modules/KDEFrameworkCompilerSettings.cmake6
1 files changed, 6 insertions, 0 deletions
diff --git a/kde-modules/KDEFrameworkCompilerSettings.cmake b/kde-modules/KDEFrameworkCompilerSettings.cmake
index 27298b8a..6a69bce9 100644
--- a/kde-modules/KDEFrameworkCompilerSettings.cmake
+++ b/kde-modules/KDEFrameworkCompilerSettings.cmake
@@ -44,6 +44,12 @@ if (NOT WIN32)
add_definitions(-DQT_STRICT_ITERATORS)
endif()
+# Some non-KF projects make (ab)use of KDEFrameworkCompilerSettings currently,
+# let them only hit this as well when bumping their min. ECM requirement to a newer version.
+if (NOT "${ECM_GLOBAL_FIND_VERSION}" VERSION_LESS "5.79.0")
+ add_definitions(-DQT_NO_FOREACH)
+endif()
+
add_definitions(
-DQT_DEPRECATED_WARNINGS_SINCE=0x060000
-DKF_DEPRECATED_WARNINGS_SINCE=0x060000