summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJüri Valdmann <juri.valdmann@qt.io>2018-03-12 10:39:08 +0100
committerKai Koehne <kai.koehne@qt.io>2018-04-17 15:20:15 +0000
commit780e8c985b384e7a3b4986075fcb88d50d6fe266 (patch)
treec00f1afc464f776910313ea8597cd090d129e823
parent77be4a9729db2e6788b9a80ddc02d30255185c6f (diff)
Build without iterator debugging
Iterator debugging (aka standard library debug mode) with libstdc++ slows down some code by orders of magnitude due to locking for each iterator operation. Disable on non-MSVC platforms. Task-number: QTBUG-66904 Change-Id: Ibb31f32235084b52988ac674b4b0bb1b198eed88 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--src/core/config/common.pri1
-rw-r--r--src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro5
2 files changed, 1 insertions, 5 deletions
diff --git a/src/core/config/common.pri b/src/core/config/common.pri
index edc77d83d..3441d9623 100644
--- a/src/core/config/common.pri
+++ b/src/core/config/common.pri
@@ -94,3 +94,4 @@ qtConfig(webengine-v8-snapshot) {
gn_args += v8_use_snapshot=false
}
+!msvc: gn_args += enable_iterator_debugging=false
diff --git a/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro b/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro
index 47b7d4ff7..ced90655e 100644
--- a/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro
+++ b/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro
@@ -21,11 +21,6 @@ LIBS_PRIVATE += $$NINJA_LIB_DIRS $$NINJA_LIBS
QMAKE_LFLAGS += $$NINJA_LFLAGS
POST_TARGETDEPS += $$NINJA_TARGETDEPS
-#ninja compiles with std::__debug
-linux: CONFIG(debug, debug|release) {
- DEFINES += _GLIBCXX_DEBUG
-}
-
# Fixme: -Werror=unused-parameter in core
QMAKE_CXXFLAGS_WARN_ON =