diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2016-07-20 15:47:13 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2016-07-26 07:52:42 +0000 |
| commit | 56c39ee55d534fae6bf1ac9113f8ff15fddf520c (patch) | |
| tree | 6a5098af60b00c3a4237e26997eed041292a611b | |
| parent | e94aa8154b9f0f115dd0df0135ddb67534abc88d (diff) | |
Don't set QT_QML_DEBUG_NO_WARNING on -no-qml-debug
It won't work anyway.
Change-Id: I2bc8f6b1b72cf30f0314ad551838db4f04c11297
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | src/qmltest/qmltest.pro | 2 | ||||
| -rw-r--r-- | tools/qml/qml.pro | 2 | ||||
| -rw-r--r-- | tools/qmlscene/qmlscene.pro | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/qmltest/qmltest.pro b/src/qmltest/qmltest.pro index 42224e9751..ebbcbcd1eb 100644 --- a/src/qmltest/qmltest.pro +++ b/src/qmltest/qmltest.pro @@ -30,6 +30,6 @@ HEADERS += \ $$PWD/quicktestresult_p.h \ $$PWD/qtestoptions_p.h -DEFINES += QT_QML_DEBUG_NO_WARNING +!contains(QT_CONFIG, no-qml-debug): DEFINES += QT_QML_DEBUG_NO_WARNING load(qt_module) diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index fe90916980..5f05054d04 100644 --- a/tools/qml/qml.pro +++ b/tools/qml/qml.pro @@ -12,6 +12,6 @@ mac { ICON = qml.icns } -DEFINES += QT_QML_DEBUG_NO_WARNING +!contains(QT_CONFIG, no-qml-debug): DEFINES += QT_QML_DEBUG_NO_WARNING load(qt_tool) diff --git a/tools/qmlscene/qmlscene.pro b/tools/qmlscene/qmlscene.pro index 0411fd8e31..b1267612c5 100644 --- a/tools/qmlscene/qmlscene.pro +++ b/tools/qmlscene/qmlscene.pro @@ -4,6 +4,7 @@ CONFIG += no_import_scan SOURCES += main.cpp -DEFINES += QML_RUNTIME_TESTING QT_QML_DEBUG_NO_WARNING +DEFINES += QML_RUNTIME_TESTING +!contains(QT_CONFIG, no-qml-debug): DEFINES += QT_QML_DEBUG_NO_WARNING load(qt_tool) |