diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-11-18 17:19:46 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-12 15:14:57 +0000 |
commit | 20c7ab44c6821e3ecc10008e005b52b465ac78e4 (patch) | |
tree | 0f9f2270e4e7f2e5962966993d2509b291eb1c41 /src/tools/bootstrap | |
parent | 81858bf1722081d99fdea72f55e67c04c5bb3d92 (diff) |
rework include path construction in the module system
the main objective was to fix the bootstrap modules in framework builds.
bootstrapped modules which "borrow" headers from "proper" modules can
specify this in a clean way now.
a side effect of this is that the bootstrap-dbus module now has its own
syncqt call.
most includepath-related setup from qt_module_pris.prf was moved to
qt_module_headers.prf.
Change-Id: Ie0d8192cfac1a8cdae0ddd0bc0cd8c3092b1e85b
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/tools/bootstrap')
-rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index ca05f804a2..4f2456cf79 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -2,8 +2,9 @@ option(host_build) TARGET = QtBootstrap QT = -CONFIG += internal_module force_bootstrap +CONFIG += minimal_syncqt internal_module force_bootstrap +MODULE_INCNAME = QtCore QtXml MODULE_DEFINES = \ QT_BOOTSTRAPPED \ QT_LITE_UNICODE \ @@ -26,21 +27,6 @@ DEFINES += \ DEFINES -= QT_EVAL -MODULE_INCLUDES = \ - \$\$QT_MODULE_INCLUDE_BASE \ - \$\$QT_MODULE_INCLUDE_BASE/QtCore \ - \$\$QT_MODULE_INCLUDE_BASE/QtXml -MODULE_PRIVATE_INCLUDES = \ - \$\$QT_MODULE_INCLUDE_BASE/QtCore/$$QT_VERSION \ - \$\$QT_MODULE_INCLUDE_BASE/QtCore/$$QT_VERSION/QtCore \ - \$\$QT_MODULE_INCLUDE_BASE/QtXml/$$QT_VERSION \ - \$\$QT_MODULE_INCLUDE_BASE/QtXml/$$QT_VERSION/QtXml - -# We need the forwarding headers before their respective modules are built, -# so do a minimal syncqt run. -CONFIG += minimal_syncqt -QMAKE_SYNCQT_OPTIONS = -module QtCore -module QtDBus -module QtXml -version $$QT_VERSION - load(qt_module) # otherwise mingw headers do not declare common functions like putenv |