diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-08-11 11:53:10 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-11 05:21:48 +0200 |
commit | 96d987edac0bbbb1a02382eae3389d75b655406b (patch) | |
tree | 6275764a4a1f01519783746e64029649d421be9f /mkspecs/features | |
parent | 7ebfe33e38a81f2a47bb251e093aeb718dbe34e6 (diff) |
Let CONFIG+=no_default_target also disable `check' by default
If the compilation of a subdir was explicitly disabled by default, then
the testing of that subdir should also be disabled by default.
Change-Id: I928e232393e89a7c27813b7a48864d4e0fb687f8
Reviewed-on: http://codereview.qt.nokia.com/2835
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Diffstat (limited to 'mkspecs/features')
-rw-r--r-- | mkspecs/features/default_post.prf | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf index 3f93220cc4..b16492b324 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -99,10 +99,16 @@ QMAKE_LIBDIR += $$QMAKE_LIBDIR_POST # Let every project have a standard GNU `check' target !contains(QMAKE_EXTRA_TARGETS, check) { # `make check' should iterate through all subdirs + # (except those with no_default_target) contains(TEMPLATE, subdirs) { check.CONFIG = recursive - check.recurse = $$SUBDIRS check.recurse_target = check + + for(subdir, SUBDIRS) { + subdir_config=$$eval($${subdir}.CONFIG) + !contains(subdir_config, no_default_target):check.recurse += $$subdir + unset(subdir_config) + } } # `make check' should imply building the project else { |