diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-03-08 21:45:43 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-16 00:12:47 +0100 |
| commit | 898e701b4aa67f04fb29bf61fd7326f5c18bec7b (patch) | |
| tree | 015cdcf775ae5eefc5f692484666fb478a0c18e5 | |
| parent | be1116fe909a60341f714d5ce0765798a08722e7 (diff) | |
bring bootstrapped QT magic from qt_tool to qt_module
project files of bootstrapped modules can, just like those of
bootstrapped tools, benefit from automatic adjustment of QT (and
CONFIG).
Change-Id: I83815e69a2b105caaee0c2e2602828f8eb425eef
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rw-r--r-- | mkspecs/features/qt_module.prf | 11 | ||||
| -rw-r--r-- | src/tools/bootstrap-dbus/bootstrap-dbus.pro | 4 | ||||
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 3 |
3 files changed, 13 insertions, 5 deletions
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index 4635f3a42a..ff74901a4a 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -26,6 +26,17 @@ isEmpty(VERSION):VERSION = $$QT_VERSION # unless overridden. Host builds are always static host_build|staticlib: CONFIG += static +host_build { + QT -= gui # no host module will ever use gui + force_bootstrap { + !build_pass: CONFIG += release + contains(QT, core(-private)?|xml) { + QT -= core core-private xml + QT += bootstrap-private + } + } +} + ucmodule = $$upper($$MODULE) isEmpty(MODULE_INCNAME): MODULE_INCNAME = $$TARGET diff --git a/src/tools/bootstrap-dbus/bootstrap-dbus.pro b/src/tools/bootstrap-dbus/bootstrap-dbus.pro index 63f7b38a73..6af70efda7 100644 --- a/src/tools/bootstrap-dbus/bootstrap-dbus.pro +++ b/src/tools/bootstrap-dbus/bootstrap-dbus.pro @@ -2,9 +2,7 @@ option(host_build) MODULE = bootstrap_dbus TARGET = QtBootstrapDBus -QT = bootstrap-private -CONFIG += no_module_headers internal_module -!build_pass: CONFIG += release +CONFIG += no_module_headers internal_module force_bootstrap DEFINES += \ QT_NO_CAST_FROM_ASCII diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 1c39d1b7a5..8b69c715d2 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -2,8 +2,7 @@ option(host_build) TARGET = QtBootstrap QT = -CONFIG += internal_module -!build_pass: CONFIG += release +CONFIG += internal_module force_bootstrap # otherwise mingw headers do not declare common functions like putenv win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x |