diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-03 20:59:13 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-26 14:58:33 +0200 |
| commit | fe5e7315608d307a7c157baaf9a702bd3c733ca8 (patch) | |
| tree | a1c53a296137a538f030207c70fc388d4c00d5d6 | |
| parent | f09291fcb8b711ba84f25c51dee70cb8d3239f55 (diff) | |
remove pointless qmltest conditionals
it is a module within this repository, and consequently the flag is
always set.
Change-Id: I8ffdd6903b1b0835725b824a9deb961d0124ce11
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
| -rw-r--r-- | examples/examples.pro | 12 | ||||
| -rw-r--r-- | src/imports/imports.pro | 9 | ||||
| -rw-r--r-- | src/src.pro | 14 | ||||
| -rw-r--r-- | tests/auto/auto.pro | 3 | ||||
| -rw-r--r-- | tools/tools.pro | 10 |
5 files changed, 34 insertions, 14 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index d3d2f5520f..5af19010c7 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,3 +1,11 @@ TEMPLATE = subdirs -SUBDIRS += demos shared localstorage particles qml quick tutorials window -contains(QT_CONFIG, qmltest): SUBDIRS += qmltest +SUBDIRS += \ + demos \ + shared \ + localstorage \ + particles \ + qml \ + quick \ + tutorials \ + window \ + qmltest diff --git a/src/imports/imports.pro b/src/imports/imports.pro index f7861ac009..899c4370d7 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -1,5 +1,10 @@ TEMPLATE = subdirs -SUBDIRS += qtquick2 particles window folderlistmodel localstorage -contains(QT_CONFIG, qmltest): SUBDIRS += testlib +SUBDIRS += \ + qtquick2 \ + particles \ + window \ + folderlistmodel \ + localstorage \ + testlib contains(QT_CONFIG, xmlpatterns) : SUBDIRS += xmllistmodel diff --git a/src/src.pro b/src/src.pro index a591ffc9a0..f1b2663c68 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,8 +1,10 @@ TEMPLATE = subdirs CONFIG += ordered -SUBDIRS += qml quick particles plugins - -contains(QT_CONFIG, qmltest): SUBDIRS += qmltest - -SUBDIRS += imports -SUBDIRS += qmldevtools +SUBDIRS += \ + qml \ + quick \ + qmltest \ + particles \ + plugins \ + imports \ + qmldevtools diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 3f5ac6924d..818bbdacfc 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -4,8 +4,7 @@ SUBDIRS=\ quick \ headersclean \ particles \ + qmltest \ qmldevtools testcocoon: SUBDIRS -= headersclean - -contains(QT_CONFIG, qmltest): SUBDIRS += qmltest diff --git a/tools/tools.pro b/tools/tools.pro index 1ce5667a19..396641193f 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,6 +1,12 @@ TEMPLATE = subdirs -SUBDIRS += qmlscene qmlplugindump qmlmin qmleasing qmlprofiler qmlbundle +SUBDIRS += \ + qmlscene \ + qmlplugindump \ + qmlmin \ + qmleasing \ + qmlprofiler \ + qmlbundle \ + qmltestrunner !contains(QT_CONFIG, no-widgets):SUBDIRS += easingcurveeditor -contains(QT_CONFIG, qmltest): SUBDIRS += qmltestrunner |