diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-25 11:57:50 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-25 11:57:50 +0100 |
| commit | 15dc45ce109fe41699950a9b87282901b21f2d3d (patch) | |
| tree | 809e79e7b55988006bb3d990168b2bb7eda360b5 /tools | |
| parent | cf53bf9ae6716613c120cc4a0202c69bd59eba1e (diff) | |
| parent | a496e0874858a4b7d991c179c0e12df46c3d324c (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ia02971527a2d1a80c5624d69330428818aab3a41
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/tools.pro | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tools/tools.pro b/tools/tools.pro index c193cc97d0..86e2f3804f 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,11 +1,8 @@ TEMPLATE = subdirs +qtHaveModule(quick): SUBDIRS += qmlscene qmlplugindump +qtHaveModule(qmltest): SUBDIRS += qmltestrunner SUBDIRS += \ - qmlscene \ - qmlplugindump \ qmlmin \ qmlprofiler \ - qmlbundle \ - qmltestrunner -qtHaveModule(widgets): SUBDIRS += qmleasing - - + qmlbundle +qtHaveModule(quick):qtHaveModule(widgets): SUBDIRS += qmleasing |