diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-10-22 12:03:53 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-25 18:54:31 +0200 |
| commit | 40620e927da43d83ff7bb9f90a9b31ef7e91fe05 (patch) | |
| tree | cf49fa6e3384ec4785ebd5ca0cf49124782dd1e8 /tools/tools.pro | |
| parent | aa07ab4562506222dc5b392ef48e59bb033f1d32 (diff) | |
untangle SUBDIRS
this also excludes qmlprofiler on android, as it is not a host tool.
Change-Id: I0bc2582fa4b951ea1f871cd67ef05d0d15ed9763
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tools/tools.pro')
| -rw-r--r-- | tools/tools.pro | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/tools/tools.pro b/tools/tools.pro index 217748915b..b7b8abaac9 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,13 +1,18 @@ TEMPLATE = subdirs -qtHaveModule(quick): !android|android_app: SUBDIRS += qmlscene qmlplugindump -qtHaveModule(qmltest): !android|android_app: SUBDIRS += qmltestrunner SUBDIRS += \ - qmlmin \ - qmlprofiler -!android|android_app: SUBDIRS += \ - qml \ - qmlbundle -qtHaveModule(quick):qtHaveModule(widgets): SUBDIRS += qmleasing + qmlmin +!android|android_app { + SUBDIRS += \ + qml \ + qmlprofiler \ + qmlbundle + qtHaveModule(quick) { + SUBDIRS += qmlscene qmlplugindump + qtHaveModule(widgets): SUBDIRS += qmleasing + } + qtHaveModule(qmltest): SUBDIRS += qmltestrunner + contains(QT_CONFIG, private_tests): SUBDIRS += qmljs +} # qmlmin & qmlbundle are build tools. # qmlscene is needed by the autotests. @@ -20,8 +25,6 @@ qtNomakeTools( \ qmleasing \ ) -contains(QT_CONFIG, private_tests): SUBDIRS += qmljs - qtHaveModule(quick) { for(subdir, SUBDIRS): $${subdir}.depends += qmlimportscanner SUBDIRS += qmlimportscanner |