diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-04-25 20:02:44 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-08 15:01:47 +0200 |
| commit | ef1d6244091e309c1bbdce7d52ad5d019ab498a0 (patch) | |
| tree | e64a61661e8e7c34101ce231a926af59f803ca47 | |
| parent | f8eb03b2832a9019077f1cb0851c08a7a1088a45 (diff) | |
adjust to new "configure -nomake tools" semantics
Change-Id: I34ea6a8ea5f6f2641bf5deaf2a7136e5ed51a8ba
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
| -rw-r--r-- | qtdeclarative.pro | 1 | ||||
| -rw-r--r-- | tests/auto/qml/qml.pro | 4 | ||||
| -rw-r--r-- | tools/tools.pro | 11 |
3 files changed, 16 insertions, 0 deletions
diff --git a/qtdeclarative.pro b/qtdeclarative.pro index 58c33f27ca..8bc15a5662 100644 --- a/qtdeclarative.pro +++ b/qtdeclarative.pro @@ -1 +1,2 @@ +CONFIG += tests_need_tools load(qt_parts) diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro index b973d44012..ed828dfb4d 100644 --- a/tests/auto/qml/qml.pro +++ b/tests/auto/qml/qml.pro @@ -69,3 +69,7 @@ SUBDIRS += debugger contains(QT_CONFIG, private_tests) { SUBDIRS += $$PRIVATETESTS } + +qtNomakeTools( \ + qmlplugindump \ +) diff --git a/tools/tools.pro b/tools/tools.pro index 86e2f3804f..eda9e85c8c 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -6,3 +6,14 @@ SUBDIRS += \ qmlprofiler \ qmlbundle qtHaveModule(quick):qtHaveModule(widgets): SUBDIRS += qmleasing + +# qmlmin & qmlbundle 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. +# The other apps are mostly "desktop" tools and are thus excluded. +qtNomakeTools( \ + qmlprofiler \ + qmlplugindump \ + qmleasing \ +) |