From a1e66dbeaa88dd20e0a3c249a8dc705b489acfa1 Mon Sep 17 00:00:00 2001
From: Rohan McGovern <rohan.mcgovern@nokia.com>
Date: Wed, 11 May 2011 09:21:51 +1000
Subject: [PATCH] tests: enable compilation of autotests for qtbase by default

Tests are now treated like examples and demos: compiled by default,
unless you configured with `-nomake tests'.  (They are still not
installed by default, however.)

Reviewed-by: Jason McDonald
Change-Id: Ifc56f6763bb2aafe6fe57b684751f99ec82ea26f
---
 configure  |  2 +-
 qtbase.pro | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index f533958987..baa94cc1ba 100755
--- a/configure
+++ b/configure
@@ -699,7 +699,7 @@ CFG_FONTCONFIG=auto
 CFG_QWS_FREETYPE=auto
 CFG_LIBFREETYPE=auto
 CFG_SQL_AVAILABLE=
-QT_DEFAULT_BUILD_PARTS="libs examples demos"
+QT_DEFAULT_BUILD_PARTS="libs examples demos tests"
 CFG_BUILD_PARTS=""
 CFG_NOBUILD_PARTS=""
 CFG_RELEASE_QMAKE=no
diff --git a/qtbase.pro b/qtbase.pro
index 7e334501ae..375308a5cc 100644
--- a/qtbase.pro
+++ b/qtbase.pro
@@ -7,12 +7,19 @@ TEMPLATE = subdirs
 
 cross_compile: CONFIG += nostrip
 
+module_qtbase_tests.subdir = tests
+module_qtbase_tests.target = module-qtbase-tests
+module_qtbase_tests.depends = module_qtbase_src
+module_qtbase_tests.CONFIG = no_default_target no_default_install
+
 #process the projects
 for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) {
     isEqual(PROJECT, examples) {
        SUBDIRS += examples
     } else:isEqual(PROJECT, demos) {
        SUBDIRS += demos
+    } else:isEqual(PROJECT, tests) {
+       module_qtbase_tests.CONFIG -= no_default_target
     } else:isEqual(PROJECT, libs) {
        include(src/src.pro)
     } else:isEqual(PROJECT, qmake) {
@@ -22,10 +29,6 @@ for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) {
     }
 }
 
-module_qtbase_tests.subdir = tests
-module_qtbase_tests.target = module-qtbase-tests
-module_qtbase_tests.depends = module_qtbase_src
-module_qtbase_tests.CONFIG = no_default_target no_default_install
 SUBDIRS += module_qtbase_tests
 
 !symbian: confclean.depends += clean