AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix -nomake tests.

Browse Source 
It now means "don't run qmake", not just "don't build".
This is consistent with -nomake demos and -nomake examples

Reviewed-by: Rohan Mcgovern
This commit is contained in:
Lincoln Ramsay 2011-05-25 12:40:25 +10:00
parent 4d10065c54
commit b4b100fb8f
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qtbase.pro
View File

@ -10,7 +10,7 @@ cross_compile: CONFIG += nostrip
module_qtbase_tests.subdir = tests module_qtbase_tests.subdir = tests
module_qtbase_tests.target = module-qtbase-tests module_qtbase_tests.target = module-qtbase-tests
module_qtbase_tests.depends = module_qtbase_src module_qtbase_tests.depends = module_qtbase_src
module_qtbase_tests.CONFIG = no_default_target no_default_install module_qtbase_tests.CONFIG = 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)))) {
@ -19,7 +19,7 @@ for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) {
} else:isEqual(PROJECT, demos) { } else:isEqual(PROJECT, demos) {
SUBDIRS += demos SUBDIRS += demos
} else:isEqual(PROJECT, tests) { } else:isEqual(PROJECT, tests) {
module_qtbase_tests.CONFIG -= no_default_target SUBDIRS += module_qtbase_tests
} else:isEqual(PROJECT, libs) { } else:isEqual(PROJECT, libs) {
include(src/src.pro) include(src/src.pro)
} else:isEqual(PROJECT, qmake) { } else:isEqual(PROJECT, qmake) {
@ -29,8 +29,6 @@ for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) {
} }
} }
SUBDIRS += module_qtbase_tests
!symbian: confclean.depends += clean !symbian: confclean.depends += clean
confclean.commands = confclean.commands =
unix:!symbian { unix:!symbian {