build host tools in release mode again

CONFIG does not contain build_all anymore,
thus we need to check QT_CONFIG in bootstrap.pr{i,o}.

Change-Id: Ia505fa101adc49f185908ca575d3211caed612db
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri
index 6b8ed2b..19e00ad 100644 (file)
--- a/src/tools/bootstrap/bootstrap.pri
+++ b/src/tools/bootstrap/bootstrap.pri
@@ -1,9 +1,6 @@
 CONFIG                += console qtinc
 CONFIG         -= qt
-build_all:!build_pass {
-    CONFIG -= build_all
-    CONFIG += release
-}
+!build_pass:contains(QT_CONFIG, build_all):CONFIG += release
 CONFIG     -= app_bundle
 CONFIG += exceptions_off
 

diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index 69aa55d..0392771 100644 (file)
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -6,10 +6,7 @@ CONFIG += static
 CONFIG += console qtinc 
 CONFIG -= qt
 CONFIG += exceptions_off
-build_all:!build_pass {
-    CONFIG -= build_all
-    CONFIG += release
-}
+!build_pass:contains(QT_CONFIG, build_all):CONFIG += release
 mac:CONFIG -= app_bundle incremental
 
 DEFINES += \