From 77fd2f8319d5fecdf9ad377ebade82e49c6f0569 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 27 Nov 2012 16:57:07 +0100 Subject: factor out testcase_targets.prf instead of letting *every* qmake-based project have recursive check target, let interested projects "subscribe" to it by adding CONFIG+=testcase_targets in a central place (.qmake.conf, which Qt itself does via qt_build_config.prf). Change-Id: Ib13fdd2d3a1adee0c5ad02b6b176a664c583bf9d Reviewed-by: Joerg Bornemann --- mkspecs/features/default_post.prf | 9 --------- mkspecs/features/qt_build_config.prf | 1 + mkspecs/features/testcase_targets.prf | 9 +++++++++ 3 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 mkspecs/features/testcase_targets.prf (limited to 'mkspecs') diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf index 6f3f318e0a..5359953d90 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -47,12 +47,3 @@ breakpad { QMAKE_INCDIR += $$QMAKE_INCDIR_POST QMAKE_LIBDIR += $$QMAKE_LIBDIR_POST - -# Let every project have a standard GNU `check' target -!contains(QMAKE_EXTRA_TARGETS, check) { - contains(TEMPLATE, subdirs): \ - prepareRecursiveTarget(check) - else: \ - check.depends = first # `make check' implies build - QMAKE_EXTRA_TARGETS += check -} diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf index 63d6b43c7c..e9d5367ee1 100644 --- a/mkspecs/features/qt_build_config.prf +++ b/mkspecs/features/qt_build_config.prf @@ -27,6 +27,7 @@ mac { CONFIG += \ create_prl link_prl \ + testcase_targets \ prepare_docs qt_docs_targets \ qt_example_installs \ no_private_qt_headers_warning QTDIR_build \ diff --git a/mkspecs/features/testcase_targets.prf b/mkspecs/features/testcase_targets.prf new file mode 100644 index 0000000000..e9b107735a --- /dev/null +++ b/mkspecs/features/testcase_targets.prf @@ -0,0 +1,9 @@ + +# Let every project have a standard GNU `check' target +!contains(QMAKE_EXTRA_TARGETS, check) { + contains(TEMPLATE, subdirs): \ + prepareRecursiveTarget(check) + else: \ + check.depends = first # `make check' implies build + QMAKE_EXTRA_TARGETS += check +} -- cgit v1.2.3