diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-10-11 11:26:49 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-10-14 09:00:36 +0000 |
| commit | a89734360154cb9bf2aebf05c5d115b970d79871 (patch) | |
| tree | 68a9a1c522b4fc6bbe1284716878b651c2a503f6 /mkspecs | |
| parent | 5c571055651b92315632b5a6ff8da6f9bddeea2a (diff) | |
fix shadow builds with pre-synced headers, part 3
with the new configure system, all modules which have a configure.json
also produce a private config header. the forwarding module pri needs to
reflect that.
Change-Id: If79e10a2643d55ad9aa9815f20297d36d9b9feec
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_module.prf | 5 | ||||
| -rw-r--r-- | mkspecs/features/qt_module_pris.prf | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index 27b1655296..a89df18f3a 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -13,6 +13,11 @@ isEmpty(MODULE):MODULE = $$section($$list($$basename(_PRO_FILE_)), ., 0, 0) isEmpty(VERSION): VERSION = $$MODULE_VERSION isEmpty(VERSION): error("Module does not define version.") +exists($$OUT_PWD/qt$${MODULE}-config.pri) { + include($$OUT_PWD/qt$${MODULE}-config.pri) + CONFIG += generated_privates +} + # Compile as shared/DLL or static according to the option given to configure # unless overridden. Host builds are always static host_build|staticlib: CONFIG += static diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf index 9542a362d0..379f8cdf17 100644 --- a/mkspecs/features/qt_module_pris.prf +++ b/mkspecs/features/qt_module_pris.prf @@ -35,9 +35,6 @@ else: \ MODULE_PRI = $$mod_inst_pfx/qt_lib_$${MODULE_ID}.pri MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri -exists($$OUT_PWD/qt$${MODULE}-config.pri): \ - include($$OUT_PWD/qt$${MODULE}-config.pri) - defineReplace(qtGetFeaturesForModule) { enabled = $$unique(QT.$${1}.enabled_features) disabled = $$unique(QT.$${1}.disabled_features) |