From a61f754c928c715cfb59a1b20c26920c54eb38c0 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 17 Feb 2012 10:48:22 +0200 Subject: Fix "check" target when load(testcase) is used in .pro file. The "check" target always depended on debug-check on projects that explicitly loaded the testcase.prf, even if Qt was configured with -release parameter. This obviously caused build failure. Changed the testcase.prf to check which configuration is preferred using CONFIG(debug, debug|release) like is done with similar cases in other .prf files. Task-number: QTBUG-24332 Change-Id: Ib5140b106e99efe51932bdd5a48914786de23230 Reviewed-by: Oswald Buddenhagen Reviewed-by: Friedemann Kleint --- mkspecs/features/testcase.prf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mkspecs/features/testcase.prf') diff --git a/mkspecs/features/testcase.prf b/mkspecs/features/testcase.prf index f890e97733..9bb9875f6d 100644 --- a/mkspecs/features/testcase.prf +++ b/mkspecs/features/testcase.prf @@ -49,11 +49,11 @@ QMAKE_EXTRA_TARGETS *= check } else { check.CONFIG = recursive # In debug and release mode, only run the test once. - # Run debug if available, release otherwise. + # Run debug if that is the preferred config, release otherwise. debug_and_release { check.target = dummy_check check.recurse_target = check - debug { + CONFIG(debug, debug|release) { real_check.depends = debug-check real_check.target = check QMAKE_EXTRA_TARGETS += real_check -- cgit v1.2.3