From 1c70033bb607d01b0272f17353c13c41603908ec Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Mon, 19 Nov 2012 17:19:12 +0100
Subject: don't set CONFIG+=release during build passes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

otherwise we get inconsistent builds.

Task-number: QTBUG-28046
Change-Id: I7952000bfc8e02ced5fd2c1bbffab7384f2730c1
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---
 src/tools/bootstrap/bootstrap.pro | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/tools/bootstrap')

diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index e57f4dfb2b..329521ab2e 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -3,6 +3,7 @@ option(host_build)
 TARGET = QtBootstrap
 QT =
 CONFIG += no_module_headers internal_module
+!build_pass: CONFIG += release
 
 MODULE_DEFINES = \
         QT_BOOTSTRAPPED \
@@ -33,8 +34,6 @@ MODULE_PRIVATE_INCLUDES = \
     \$\$QT_MODULE_INCLUDE_BASE/QtXml/$$QT_VERSION \
     \$\$QT_MODULE_INCLUDE_BASE/QtXml/$$QT_VERSION/QtXml
 
-CONFIG += release
-
 load(qt_module)
 
 INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global
-- 
cgit v1.2.3