From 00b1f67ef595c6fd2b326738ea7ac03c0e23303b Mon Sep 17 00:00:00 2001 From: David Faure Date: Sun, 16 Aug 2015 01:16:04 +0200 Subject: 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 --- kde-modules/KDEFrameworkCompilerSettings.cmake | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'kde-modules/KDEFrameworkCompilerSettings.cmake') 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() -- cgit v1.2.1