diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-25 12:44:57 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-25 12:44:57 +1000 |
| commit | 6430f82dfbe1517579a053b189732e433d087bd2 (patch) | |
| tree | 4ea80267127a8ed07f8ee794bbfd9a9a40270513 | |
| parent | 6bd691dc5402f22840a3354b08cb6bdc99b01006 (diff) | |
| parent | b4b100fb8f42e2368196135b129af1906cffa6fa (diff) | |
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.
| -rw-r--r-- | qtbase.pro | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/qtbase.pro b/qtbase.pro index 375308a5cc..9b140025bb 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -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 { |