From a03b14f68508cf08f051ed882604485f230cff30 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 30 Jul 2012 13:52:01 +0200 Subject: [PATCH] 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 --- src/tools/bootstrap/bootstrap.pri | 5 +---- src/tools/bootstrap/bootstrap.pro | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri index 6b8ed2b96e..19e00ad478 100644 --- 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 69aa55da7f..039277150f 100644 --- 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 += \