From 7015b464c0aa5c69ce204fc8d81438ee949a2e71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 14 Mar 2013 15:51:37 +0100 Subject: Fix interaction between sdk.prf and silent.prf The 'silent' option to CONFIG will mangle QMAKE_CXX and friends by prepending an @echo, which sdk.prf doesn't handle (it assumes the variables contain names of executables, with optional arguments). Instead of teaching sdk.prf generic command line parsing we ensure that silent.prf does its job at the very end, when the tools have already had their paths fixed by sdk.prf. Change-Id: I7093232e5cc37ed8106a3b838f42ad8f1a43fb86 Reviewed-by: Frederik Gladhorn --- mkspecs/features/default_post.prf | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'mkspecs') diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf index cdd200e80b..c756455dd2 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -47,6 +47,14 @@ incredibuild_xge { CONFIG = incredibuild_xge $$CONFIG } +silent { + # Ensure that we process silent.prf last, as it will mangle QMAKE_CXX + # and friends in a way that some of the other features (sdk.prf and + # simd.prf eg) do not handle. + CONFIG -= silent + CONFIG = silent $$CONFIG +} + force_debug_info:win32 { load(resolve_target) QMAKE_CLEAN += $$replace(QMAKE_RESOLVED_TARGET, ...$, pdb) # for the debug case it is hardcoded in qmake -- cgit v1.2.3