AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bring bootstrapped QT magic from qt_tool to qt_module

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2013-03-08 21:45:43 +01:00 committed by The Qt Project
parent be1116fe90
commit 898e701b4a
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mkspecs/features/qt_module.prf
View File

@ -26,6 +26,17 @@ isEmpty(VERSION):VERSION = $$QT_VERSION
# unless overridden. Host builds are always static # unless overridden. Host builds are always static
host_build|staticlib: CONFIG += 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) ucmodule = $$upper($$MODULE)
isEmpty(MODULE_INCNAME): MODULE_INCNAME = $$TARGET isEmpty(MODULE_INCNAME): MODULE_INCNAME = $$TARGET

4
src/tools/bootstrap-dbus/bootstrap-dbus.pro
View File

@ -2,9 +2,7 @@ option(host_build)
MODULE = bootstrap_dbus MODULE = bootstrap_dbus
TARGET = QtBootstrapDBus TARGET = QtBootstrapDBus
QT = bootstrap-private CONFIG += no_module_headers internal_module force_bootstrap
CONFIG += no_module_headers internal_module
!build_pass: CONFIG += release
DEFINES += \ DEFINES += \
QT_NO_CAST_FROM_ASCII QT_NO_CAST_FROM_ASCII

3
src/tools/bootstrap/bootstrap.pro
View File

@ -2,8 +2,7 @@ option(host_build)
TARGET = QtBootstrap TARGET = QtBootstrap
QT = QT =
CONFIG += internal_module CONFIG += internal_module force_bootstrap
!build_pass: CONFIG += release
# otherwise mingw headers do not declare common functions like putenv # otherwise mingw headers do not declare common functions like putenv
win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x