From 648650313384d893e7fa8c179090d42f8167c13a Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Wed, 14 Sep 2011 11:33:25 +1000 Subject: [PATCH] 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 Reviewed-by: Charles Yin --- src/imports/imports.pro | 3 +-- src/src.pro | 3 +-- tools/tools.pro | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/imports/imports.pro b/src/imports/imports.pro index 6096ad7..c60e72d 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 baebcaa..6fbfc24 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 29340c6..b963309 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 -- 2.7.4