From f2b77e0c3cfdcd05ae0585daa3cf9b8e88dcac69 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Thu, 15 Nov 2012 14:49:19 +0100
Subject: make qt_tool support building bootstrapped tools
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

as a "side effect", this fixes the build of bootstrapped tools when
doing a debug build under msvc: qt.prf would add CONFIG+=release after
default_post.prf already loaded debug.prf.

Change-Id: Idd17cf28d358950fd90bb18ca7a8d67e06953bc1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
---
 mkspecs/features/qt_tool.prf | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
index 27753f26dd..bae6138067 100644
--- a/mkspecs/features/qt_tool.prf
+++ b/mkspecs/features/qt_tool.prf
@@ -6,11 +6,18 @@ DESTDIR = $$MODULE_BASE_OUTDIR/bin
 CONFIG += qt warn_on console
 isEmpty(QMAKE_INFO_PLIST): CONFIG -= app_bundle
 
-!build_pass:contains(QT_CONFIG, build_all): CONFIG += release
-
-target.path = $$[QT_INSTALL_BINS]
+host_build {
+    CONFIG += release
+    QT = bootstrap-private
+    target.path = $$[QT_HOST_BINS]
+} else {
+    !build_pass:contains(QT_CONFIG, build_all): CONFIG += release
+    target.path = $$[QT_INSTALL_BINS]
+}
 INSTALLS += target
 
+load(qt_targets)
+
 # If we are doing a prefix build, create a "module" pri which enables
 # qtPrepareTool() to work with the non-installed build.
 !build_pass:!exists($$[QT_INSTALL_PREFIX]/.qmake.cache) {
-- 
cgit v1.2.3