diff options
| author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2011-05-25 12:40:25 +1000 |
|---|---|---|
| committer | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2011-05-25 12:40:25 +1000 |
| commit | b4b100fb8f42e2368196135b129af1906cffa6fa (patch) | |
| tree | 19164b50c9da88d5bfa50d6be9a0aa8995a6292e | |
| parent | 4d10065c54f9b277f44ed042f4e18858dafdd1df (diff) | |
Fix -nomake tests.
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
| -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 { |