diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-07-02 17:38:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-07-18 20:45:03 +0000 |
| commit | 88245e89d361e73be28f5d626a7af7609a465581 (patch) | |
| tree | 2ee3a9a669717156c213b7ba1f0fbe80b2e54b3e | |
| parent | 73b77bc51213525bc47d2d73e516207614b950f0 (diff) | |
With -no-qml-debug, don't compile debug plugins and tests
This eliminates many #ifdefs and prevents the compilartion of broken
plugins.
Change-Id: Ib2763ed9e6580307482b885d71c1ad1010959ef2
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| -rw-r--r-- | src/plugins/plugins.pro | 2 | ||||
| -rw-r--r-- | src/qml/debugger/debugger.pri | 2 | ||||
| -rw-r--r-- | tests/auto/qml/qml.pro | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 664a457608..273407c19d 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -1,2 +1,2 @@ TEMPLATE = subdirs -SUBDIRS += qmltooling +!contains(QT_CONFIG, no-qml-debug):SUBDIRS += qmltooling diff --git a/src/qml/debugger/debugger.pri b/src/qml/debugger/debugger.pri index 77a3ba6490..4021350878 100644 --- a/src/qml/debugger/debugger.pri +++ b/src/qml/debugger/debugger.pri @@ -1,3 +1,5 @@ +contains(QT_CONFIG, no-qml-debug):DEFINES += QT_NO_QML_DEBUGGER + SOURCES += \ $$PWD/qqmldebugservice.cpp \ $$PWD/qqmlprofilerservice.cpp \ diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro index 6f1bea6d92..2ca3e42991 100644 --- a/tests/auto/qml/qml.pro +++ b/tests/auto/qml/qml.pro @@ -71,7 +71,7 @@ qtHaveModule(widgets) { SUBDIRS += $$PUBLICTESTS SUBDIRS += $$METATYPETESTS -!winrt: SUBDIRS += debugger # no QProcess on winrt +!winrt:!contains(QT_CONFIG, no-qml-debug): SUBDIRS += debugger # no QProcess on winrt contains(QT_CONFIG, private_tests) { SUBDIRS += $$PRIVATETESTS |