From 41b87eeb4329b9e287d2350618c063fa1d158258 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 21 Nov 2014 13:38:53 +0100 Subject: Make QtWebKit configure report the right configuration Debug and release configurations are mutually exclusive, so only the last one defines the configuration. QtWebKit was however reporting both if both were set producing confusion output. Change-Id: If26e4ee02c922fbb880197379c6967c85746b482 Reviewed-by: Oswald Buddenhagen Reviewed-by: Jocelyn Turcotte --- Tools/qmake/mkspecs/features/configure.prf | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Tools/qmake/mkspecs/features/configure.prf b/Tools/qmake/mkspecs/features/configure.prf index e23f509b8..1434dc132 100644 --- a/Tools/qmake/mkspecs/features/configure.prf +++ b/Tools/qmake/mkspecs/features/configure.prf @@ -220,10 +220,9 @@ defineTest(finalizeConfigure) { log($${EOL}Final configuration:$${EOL}$${EOL}) - debug: buildConfig += debug - release: buildConfig += release - buildConfig = $$join(buildConfig,/,,) - debug:release:debug_and_release:buildConfig += (combined) + debug:release:debug_and_release: buildConfig = debug+release + else: CONFIG(debug, debug|release): buildConfig = debug + else: buildConfig = release log(Build ......................... $$build$${EOL}) log(Configuration ................. $$buildConfig$${EOL}) -- cgit v1.2.3