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
This commit is contained in:
parent
0012bd57a9
commit
a1e66dbeaa
2
configure
vendored
2
configure
vendored
@ -699,7 +699,7 @@ CFG_FONTCONFIG=auto
|
|||||||
CFG_QWS_FREETYPE=auto
|
CFG_QWS_FREETYPE=auto
|
||||||
CFG_LIBFREETYPE=auto
|
CFG_LIBFREETYPE=auto
|
||||||
CFG_SQL_AVAILABLE=
|
CFG_SQL_AVAILABLE=
|
||||||
QT_DEFAULT_BUILD_PARTS="libs examples demos"
|
QT_DEFAULT_BUILD_PARTS="libs examples demos tests"
|
||||||
CFG_BUILD_PARTS=""
|
CFG_BUILD_PARTS=""
|
||||||
CFG_NOBUILD_PARTS=""
|
CFG_NOBUILD_PARTS=""
|
||||||
CFG_RELEASE_QMAKE=no
|
CFG_RELEASE_QMAKE=no
|
||||||
|
11
qtbase.pro
11
qtbase.pro
@ -7,12 +7,19 @@ TEMPLATE = subdirs
|
|||||||
|
|
||||||
cross_compile: CONFIG += nostrip
|
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
|
#process the projects
|
||||||
for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) {
|
for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) {
|
||||||
isEqual(PROJECT, examples) {
|
isEqual(PROJECT, examples) {
|
||||||
SUBDIRS += examples
|
SUBDIRS += examples
|
||||||
} else:isEqual(PROJECT, demos) {
|
} else:isEqual(PROJECT, demos) {
|
||||||
SUBDIRS += demos
|
SUBDIRS += demos
|
||||||
|
} else:isEqual(PROJECT, tests) {
|
||||||
|
module_qtbase_tests.CONFIG -= no_default_target
|
||||||
} else:isEqual(PROJECT, libs) {
|
} else:isEqual(PROJECT, libs) {
|
||||||
include(src/src.pro)
|
include(src/src.pro)
|
||||||
} else:isEqual(PROJECT, qmake) {
|
} 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
|
SUBDIRS += module_qtbase_tests
|
||||||
|
|
||||||
!symbian: confclean.depends += clean
|
!symbian: confclean.depends += clean
|
||||||
|
Loading…
Reference in New Issue
Block a user