diff options
| author | Friedrich W. H. Kossebau <kossebau@kde.org> | 2021-01-31 13:10:29 +0100 |
|---|---|---|
| committer | Friedrich W. H. Kossebau <kossebau@kde.org> | 2021-01-31 13:10:29 +0100 |
| commit | 24d4578e80e978ee6f1d8deca2cb3a5ae5e9e18f (patch) | |
| tree | 05c59d234753bedb5a3811b3a9d0252e3de6c0cf | |
| parent | 00c82eaa7b515349983ec43872c894cdf4363828 (diff) | |
| download | extra-cmake-modules-24d4578e80e978ee6f1d8deca2cb3a5ae5e9e18f.tar.gz extra-cmake-modules-24d4578e80e978ee6f1d8deca2cb3a5ae5e9e18f.tar.bz2 | |
KDEFrameworksCompilerSettings: define -DQT_NO_KEYWORDS by default
| -rw-r--r-- | kde-modules/KDEFrameworkCompilerSettings.cmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kde-modules/KDEFrameworkCompilerSettings.cmake b/kde-modules/KDEFrameworkCompilerSettings.cmake index 6a69bce9..329be097 100644 --- a/kde-modules/KDEFrameworkCompilerSettings.cmake +++ b/kde-modules/KDEFrameworkCompilerSettings.cmake @@ -31,7 +31,6 @@ add_definitions(-DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_NO_URL_CAST_FROM_STRING -DQT_NO_CAST_FROM_BYTEARRAY - -DQT_NO_SIGNALS_SLOTS_KEYWORDS -DQT_USE_QSTRINGBUILDER -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT ) @@ -47,7 +46,12 @@ 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) + add_definitions( + -DQT_NO_KEYWORDS + -DQT_NO_FOREACH + ) +else() + add_definitions(-DQT_NO_SIGNALS_SLOTS_KEYWORDS) endif() add_definitions( |