From 52b3a81865a39a69dce969bd24327ba89180e116 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 15 Jul 2016 18:21:00 +0200 Subject: don't distclean before every compile test run in non-clean build dir due to gmake's Makefile auto-rebuild feature, the distclean would typically invoke qmake. overall, the step would almost double the run time of each compile test. instead, just clean between the regular qmake and make steps. this deletes the object file the test executable depends on, so this is sufficient to trigger a full rebuild. Change-Id: If8e254e172dd169e31fd606d9ef31d9a14f670d8 Reviewed-by: Lars Knoll --- mkspecs/features/qt_configure.prf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mkspecs') diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index f4d94c02bc..63ee6a48db 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -435,7 +435,8 @@ defineTest(qtConfTest_compile) { qmake_args += "\"INCLUDEPATH *= $$includedir\"" # Clean up after previous run - exists($$test_out_dir/Makefile): qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE distclean") + exists($$test_out_dir/Makefile): \ + QMAKE_MAKE = "$$QMAKE_MAKE clean && $$QMAKE_MAKE" mkpath($$test_out_dir)|error() -- cgit v1.2.3