From 2796ceff50dbb78a10811beaee7797d6ed5ec23d Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Thu, 6 Dec 2012 19:42:59 +0100
Subject: make QT setup for bootstrapped tools more clever

instead of simply overwriting it, intelligently re-interpret it.

Change-Id: I5f7d8fff69ac8092653d7583da4c3884b9864b3a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 mkspecs/features/qt_tool.prf | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
index 0c6208b2fd..a49b3f25db 100644
--- a/mkspecs/features/qt_tool.prf
+++ b/mkspecs/features/qt_tool.prf
@@ -19,7 +19,11 @@ isEmpty(QMAKE_INFO_PLIST): CONFIG -= app_bundle
 
 host_build {
     !build_pass: CONFIG += release
-    QT = bootstrap-private
+    QT -= gui   # no host tool will ever use gui
+    contains(QT, core(-private)?|xml) {
+        QT -= core core-private xml
+        QT += bootstrap-private
+    }
     target.path = $$[QT_HOST_BINS]
 } else {
     !build_pass:contains(QT_CONFIG, build_all): CONFIG += release
-- 
cgit v1.2.3