diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-05-11 09:21:51 +1000 |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-05-11 11:52:24 +1000 |
commit | a1e66dbeaa88dd20e0a3c249a8dc705b489acfa1 (patch) | |
tree | da07e9d03af3e269992ae346f34373c2e8c5ca3a | |
parent | 0012bd57a905828dc1f99ae64a182b702455f3bb (diff) |
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
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | qtbase.pro | 11 |
2 files changed, 8 insertions, 5 deletions
@@ -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 |