diff options
author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2016-01-22 14:35:56 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2016-01-22 14:28:48 +0000 |
commit | 90ba088773f669b9c87a000ff781b7033679679f (patch) | |
tree | 4ddc8f06b4b7724e66e14dcb37c08faf6565a789 | |
parent | ce093497f2d4164fa8abc06cf976f9e36798e11e (diff) |
Don't build qmldebug or qmlprofiler on -no-qml-debug
qmlprofiler depends on qmldebug and won't work with that version of Qt
anyway.
Change-Id: I86a180671b8d7c84e9ab05ff1cef4e6a5ea4f7f3
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
-rw-r--r-- | src/src.pro | 3 | ||||
-rw-r--r-- | tools/tools.pro | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/src.pro b/src/src.pro index 18e9ba6704..385e4eb601 100644 --- a/src/src.pro +++ b/src/src.pro @@ -14,8 +14,9 @@ qtHaveModule(gui):contains(QT_CONFIG, opengl(es1|es2)?) { SUBDIRS += \ plugins \ - qmldebug \ imports \ qmldevtools +!contains(QT_CONFIG, no-qml-debug): SUBDIRS += qmldebug + qmldevtools.CONFIG = host_build diff --git a/tools/tools.pro b/tools/tools.pro index b2e9e27066..6e25509216 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -9,8 +9,10 @@ qmlimportscanner.CONFIG = host_build !android|android_app { SUBDIRS += \ qml \ - qmlprofiler \ qmllint + + !contains(QT_CONFIG, no-qml-debug): SUBDIRS += qmlprofiler + qtHaveModule(quick) { !static: SUBDIRS += qmlscene qmlplugindump qtHaveModule(widgets): SUBDIRS += qmleasing |