diff options
| -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 |