aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/util/util.pri
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2016-08-01 16:38:56 +0200
committerUlf Hermann <ulf.hermann@qt.io>2016-08-03 08:46:16 +0000
commit5b620ed68909c63f3a5a892577a07f66d35c2923 (patch)
treed42f80a4033b8b49fae775f05585d8707ef3e447 /src/quick/util/util.pri
parent1c20a3b8b652a6179438da5c2b3a72183279cdfa (diff)
Add QT_NO_QML_DEBUGGER to MODULE_DEFINES on -no-qml-debug
If -no-qml-debug is set when building QtQml, we have to add QT_NO_QML_DEBUGGER when building application code, because this build option modifies the headers and linking an application built with QML debugging against a Qt built without is crashy. Change-Id: Ib150810f40deb98dcf398e3998401358a25155d9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/quick/util/util.pri')
-rw-r--r--src/quick/util/util.pri6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/quick/util/util.pri b/src/quick/util/util.pri
index 2c31f6feed..66792536d7 100644
--- a/src/quick/util/util.pri
+++ b/src/quick/util/util.pri
@@ -31,11 +31,7 @@ SOURCES += \
$$PWD/qquickshortcut.cpp \
$$PWD/qquickvalidator.cpp
-contains(QT_CONFIG, no-qml-debug) {
- DEFINES += QT_NO_QML_DEBUGGER
-} else {
- SOURCES += $$PWD/qquickprofiler.cpp
-}
+!contains(QT_CONFIG, no-qml-debug): SOURCES += $$PWD/qquickprofiler.cpp
HEADERS += \
$$PWD/qquickapplication_p.h\