summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2012-12-06 19:42:59 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-12 23:11:36 +0100
commit2796ceff50dbb78a10811beaee7797d6ed5ec23d (patch)
tree32d37905808da1d73675bb11a0b5d0a7b1cc8c46
parentef7c25e8486a092ead3c02e0346cc0d765d6a22f (diff)
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>
-rw-r--r--mkspecs/features/qt_tool.prf6
1 files changed, 5 insertions, 1 deletions
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