diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-03-02 13:49:11 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-03-02 13:49:11 +0100 |
| commit | 32c1212f81fcfc7b5e49f85d68b05cd94cd90521 (patch) | |
| tree | 795a3175173285f4ba5bd15cdc7ae6ec11c556d2 /tools/tools.pro | |
| parent | 79d3fe1bba4589c7f5780bb505eac7872061ee32 (diff) | |
| parent | 78dd18a0cd18449e1289e428ea6eca65e28fb114 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/pointerhandler
Change-Id: I7e43a0a47d49de38617f6afc7548f9a9e212a851
Diffstat (limited to 'tools/tools.pro')
| -rw-r--r-- | tools/tools.pro | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tools/tools.pro b/tools/tools.pro index f3988a909a..bf39a649df 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -2,7 +2,8 @@ TEMPLATE = subdirs QT_FOR_CONFIG += qml-private SUBDIRS += \ qmlmin \ - qmlimportscanner + qmlimportscanner \ + qmlcachegen !android|android_app { SUBDIRS += \ @@ -15,8 +16,12 @@ SUBDIRS += \ !static: { SUBDIRS += \ qmlscene \ - qmlplugindump \ qmltime + + qtConfig(regularexpression) { + SUBDIRS += \ + qmlplugindump + } } qtHaveModule(widgets): SUBDIRS += qmleasing } @@ -27,7 +32,7 @@ SUBDIRS += \ qml.depends = qmlimportscanner qmleasing.depends = qmlimportscanner -# qmlmin, qmlimportscanner & qmlbundle are build tools. +# qmlmin, qmlimportscanner & qmlcachegen are build tools. # qmlscene is needed by the autotests. # qmltestrunner may be useful for manual testing. # qmlplugindump cannot be a build tool, because it loads target plugins. |