diff options
| author | David Faure <faure@kde.org> | 2015-08-16 01:16:04 +0200 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2015-08-18 23:58:08 +0200 |
| commit | 00b1f67ef595c6fd2b326738ea7ac03c0e23303b (patch) | |
| tree | 22d1ed1da3cbd99f139997b4c55d1e316e0d5bc1 /kde-modules | |
| parent | 2b0951d3b6b3740b12a2cc3eedf8b3d1f6eba943 (diff) | |
| download | extra-cmake-modules-00b1f67ef595c6fd2b326738ea7ac03c0e23303b.tar.gz extra-cmake-modules-00b1f67ef595c6fd2b326738ea7ac03c0e23303b.tar.bz2 | |
KDEFrameworkCompilerSettings: only enable strict iterators in debug mode
(they are slower). And enable them on MSVC now that we rely on Qt 5.3, as the comment said.
REVIEW: 124762
Diffstat (limited to 'kde-modules')
| -rw-r--r-- | kde-modules/KDEFrameworkCompilerSettings.cmake | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/kde-modules/KDEFrameworkCompilerSettings.cmake b/kde-modules/KDEFrameworkCompilerSettings.cmake index 1bc23ccf..d499444f 100644 --- a/kde-modules/KDEFrameworkCompilerSettings.cmake +++ b/kde-modules/KDEFrameworkCompilerSettings.cmake @@ -40,11 +40,7 @@ add_definitions(-DQT_NO_CAST_TO_ASCII -DQT_USE_FAST_OPERATOR_PLUS -DQT_USE_QSTRINGBUILDER ) -if(NOT MSVC) - # QT_STRICT_ITERATORS breaks MSVC: it tries to link to QTypedArrayData symbols - # when using foreach. However these symbols don't actually exist. - # Not having QT_STRICT_ITERATORS defined fixes this issue. - # This is fixed by https://codereview.qt-project.org/#change,76311 - # TODO: set QT_STRICT_ITERATORS on all platforms once we depend on Qt 5.3 - add_definitions(-DQT_STRICT_ITERATORS) + +if (CMAKE_BUILD_TYPE STREQUAL "Debug") + add_definitions(-DQT_STRICT_ITERATORS) endif() |