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>

8 files changed, 17 insertions, 44 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) {
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index 887bc49038..e57f4dfb2b 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -24,7 +24,6 @@ DEFINES += \
     $$MODULE_DEFINES \
     QT_NO_CAST_FROM_ASCII
 
-MODULE_CONFIG = console -app_bundle release
 MODULE_PRIVATE_INCLUDES = \
     \$\$QT_MODULE_INCLUDE_BASE \
     \$\$QT_MODULE_INCLUDE_BASE/QtCore \
@@ -34,7 +33,7 @@ MODULE_PRIVATE_INCLUDES = \
     \$\$QT_MODULE_INCLUDE_BASE/QtXml/$$QT_VERSION \
     \$\$QT_MODULE_INCLUDE_BASE/QtXml/$$QT_VERSION/QtXml
 
-qtProcessModuleFlags(CONFIG, MODULE_CONFIG)
+CONFIG += release
 
 load(qt_module)
 
diff --git a/src/tools/moc/moc.pro b/src/tools/moc/moc.pro
index 12ca725134..3a6fd2a02d 100644
--- a/src/tools/moc/moc.pro
+++ b/src/tools/moc/moc.pro
@@ -1,9 +1,6 @@
 option(host_build)
-TEMPLATE = app
-QT = bootstrap-private
 
 DEFINES += QT_MOC QT_NO_CAST_FROM_ASCII QT_NO_CAST_FROM_BYTEARRAY QT_NO_COMPRESS
-DESTDIR = ../../../bin
 
 INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global
 
@@ -11,6 +8,4 @@ include(moc.pri)
 HEADERS += qdatetime_p.h
 SOURCES += main.cpp
 
-target.path = $$[QT_HOST_BINS]
-INSTALLS += target
-load(qt_targets)
+load(qt_tool)
diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
index c18e834d13..a17b91dd79 100644
--- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
+++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
@@ -1,8 +1,4 @@
 option(host_build)
-TEMPLATE = app
-QT = bootstrap-private
-
-DESTDIR = ../../../bin
 
 include(../moc/moc.pri)
 
@@ -28,6 +24,4 @@ SOURCES += qdbuscpp2xml.cpp \
           $$QT_SOURCE_TREE/src/dbus/qdbus_symbols.cpp \
           $$QT_SOURCE_TREE/src/dbus/qdbusunixfiledescriptor.cpp
 
-target.path = $$[QT_HOST_BINS]
-INSTALLS += target
-load(qt_targets)
+load(qt_tool)
diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
index 7319958363..7c2bb2e22f 100644
--- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
+++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
@@ -1,8 +1,4 @@
 option(host_build)
-TEMPLATE = app
-QT = bootstrap-private
-
-DESTDIR = ../../../bin
 
 DEFINES += QT_NO_CAST_FROM_ASCII
 
@@ -28,6 +24,4 @@ SOURCES = qdbusxml2cpp.cpp \
           $$QT_SOURCE_TREE/src/dbus/qdbus_symbols.cpp \
           $$QT_SOURCE_TREE/src/dbus/qdbusunixfiledescriptor.cpp
 
-target.path = $$[QT_HOST_BINS]
-INSTALLS += target
-load(qt_targets)
+load(qt_tool)
diff --git a/src/tools/qdoc/qdoc.pro b/src/tools/qdoc/qdoc.pro
index 5b7219e2f6..b489668059 100644
--- a/src/tools/qdoc/qdoc.pro
+++ b/src/tools/qdoc/qdoc.pro
@@ -1,8 +1,5 @@
 option(host_build)
-TEMPLATE = app
-QT = bootstrap-private
 
-DESTDIR = ../../../bin
 DEFINES += QDOC2_COMPAT
 
 INCLUDEPATH += $$QT_SOURCE_TREE/src/tools/qdoc \
@@ -111,7 +108,4 @@ qch-docs.CONFIG += no_check_exist directory
 
 QMAKE_EXTRA_TARGETS += html-docs qch-docs
 
-target.path = $$[QT_HOST_BINS]
-INSTALLS += target
-
-load(qt_targets)
+load(qt_tool)
diff --git a/src/tools/rcc/rcc.pro b/src/tools/rcc/rcc.pro
index a1d227ea0b..f4ad2f63d7 100644
--- a/src/tools/rcc/rcc.pro
+++ b/src/tools/rcc/rcc.pro
@@ -1,14 +1,9 @@
 option(host_build)
-TEMPLATE = app
-QT = bootstrap-private
 
-DESTDIR = ../../../bin
 DEFINES += QT_RCC QT_NO_CAST_FROM_ASCII
 
 include(rcc.pri)
 HEADERS += ../../corelib/kernel/qcorecmdlineargs_p.h
 SOURCES += main.cpp
 
-target.path = $$[QT_HOST_BINS]
-INSTALLS += target
-load(qt_targets)
+load(qt_tool)
diff --git a/src/tools/uic/uic.pro b/src/tools/uic/uic.pro
index 69facec9f8..77b8c4ba02 100644
--- a/src/tools/uic/uic.pro
+++ b/src/tools/uic/uic.pro
@@ -1,8 +1,5 @@
 option(host_build)
-TEMPLATE = app
-QT = bootstrap-private
 
-DESTDIR = ../../../bin
 DEFINES += QT_UIC QT_NO_CAST_FROM_ASCII
 
 include(uic.pri)
@@ -19,6 +16,4 @@ SOURCES += main.cpp \
     QMAKE_CXXFLAGS_RELEASE -= -O2
 }
 
-target.path = $$[QT_HOST_BINS]
-INSTALLS += target
-load(qt_targets)
+load(qt_tool)