whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging 

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Fix -nomake tests.
bb10
Qt Continuous Integration System 2011-05-25 12:44:57 +10:00
parent 6bd691dc54 b4b100fb8f
commit 6430f82dfb
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.target = module-qtbase-tests
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
for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) {
@ -19,7 +19,7 @@ for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) {
} else:isEqual(PROJECT, demos) {
SUBDIRS += demos
} else:isEqual(PROJECT, tests) {
module_qtbase_tests.CONFIG -= no_default_target
SUBDIRS += module_qtbase_tests
} else:isEqual(PROJECT, libs) {
include(src/src.pro)
} else:isEqual(PROJECT, qmake) {
@ -29,8 +29,6 @@ for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) {
}
}
SUBDIRS += module_qtbase_tests
!symbian: confclean.depends += clean
confclean.commands =
unix:!symbian {