diff options
Diffstat (limited to 'mkspecs/features/qt_tool.prf')
| -rw-r--r-- | mkspecs/features/qt_tool.prf | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf index b449e4074d..56ba1169a1 100644 --- a/mkspecs/features/qt_tool.prf +++ b/mkspecs/features/qt_tool.prf @@ -17,9 +17,13 @@ DESTDIR = $$MODULE_BASE_OUTDIR/bin CONFIG += console isEmpty(QMAKE_INFO_PLIST): CONFIG -= app_bundle -host_build { +host_build: QT -= gui # no host tool will ever use gui +host_build:force_bootstrap { !build_pass: CONFIG += release - QT = bootstrap-private + 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 @@ -28,10 +32,12 @@ host_build { INSTALLS += target load(qt_targets) +load(qt_common) # If we are doing a prefix build, create a "module" pri which enables # qtPrepareTool() to work with the non-installed build. -!build_pass:prefix_build { +# Non-bootstrapped tools always need this because of the environment setup. +!build_pass:if(!host_build|!force_bootstrap|prefix_build) { isEmpty(MODULE):MODULE = $$TARGET @@ -41,7 +47,7 @@ load(qt_targets) load(resolve_target) cmd = $$shell_path($$QMAKE_RESOLVED_TARGET) - !host_build: qtAddTargetEnv(cmd) + !host_build|!force_bootstrap: qtAddTargetEnv(cmd) TOOL_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_tool_$${MODULE}.pri |