diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-09-14 11:33:25 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-19 10:50:11 +0200 |
| commit | 648650313384d893e7fa8c179090d42f8167c13a (patch) | |
| tree | 79884db3d78810089ed62c8b43a547e18be05039 | |
| parent | 9175109e8c6f55c365edf96797c249ffe6b74bf7 (diff) | |
Re-enable QtQuickTest.
This was disabled in refactor, but it seems to be working OK, so turn it
back on.
Change-Id: I35d97342c6ef7be358d9cb593a1eab27c711247c
Reviewed-on: http://codereview.qt-project.org/4846
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
| -rw-r--r-- | src/imports/imports.pro | 3 | ||||
| -rw-r--r-- | src/src.pro | 3 | ||||
| -rw-r--r-- | tools/tools.pro | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/imports/imports.pro b/src/imports/imports.pro index 6096ad7a6a..c60e72db08 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -1,6 +1,5 @@ TEMPLATE = subdirs SUBDIRS += qtquick1 qt47 folderlistmodel particles gestures inputcontext etcprovider -# ### refactor: port properly -# contains(QT_CONFIG, qmltest): SUBDIRS += testlib +contains(QT_CONFIG, qmltest): SUBDIRS += testlib diff --git a/src/src.pro b/src/src.pro index baebcaa97f..6fbfc243de 100644 --- a/src/src.pro +++ b/src/src.pro @@ -2,8 +2,7 @@ TEMPLATE = subdirs CONFIG += ordered SUBDIRS += declarative qtquick1 plugins -# ### refactor: port properly -# contains(QT_CONFIG, qmltest): SUBDIRS += qmltest +contains(QT_CONFIG, qmltest): SUBDIRS += qmltest SUBDIRS += imports diff --git a/tools/tools.pro b/tools/tools.pro index 29340c61b0..b963309d74 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,6 +1,5 @@ TEMPLATE = subdirs SUBDIRS += qmlviewer qmlscene qmlplugindump -# ### refactor: port properly -# contains(QT_CONFIG, qmltest): SUBDIRS += qmltestrunner +contains(QT_CONFIG, qmltest): SUBDIRS += qmltestrunner |