diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-11-15 14:49:19 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-16 15:59:20 +0100 |
| commit | f2b77e0c3cfdcd05ae0585daa3cf9b8e88dcac69 (patch) | |
| tree | 6fb058b36e752a6a9b113836a04f65a1edc24239 /mkspecs | |
| parent | 4b85211a43d430978470f1b56be941a7124164fd (diff) | |
make qt_tool support building bootstrapped tools
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>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_tool.prf | 13 |
1 files changed, 10 insertions, 3 deletions
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) { |