summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2018-05-02 18:07:05 +0200
committerMichal Klocek <michal.klocek@qt.io>2018-08-03 14:15:41 +0000
commit133fb029a6b9c3ee06792887b61c8ed52315f58b (patch)
tree7b9d40403bc5e1df7528d6ae7fb52f082ee0d245
parentc6cca0f492717582cb113f3d62e97f554798cf14 (diff)
make it possible to override the basename of module config files
using qt$$MODULE isn't enough if the module is composed of submodules which need the final module's headers, because that would require two modules having the same module .pri file. the first thought to fix this was to just use $$lower($$TARGET), but that breaks for testlib (QtTest). while the config file name isn't public api, it's included by a public header, so changing it is risky. so instead stay with the original pattern, but make it explicitly overrideable. the cherry-pick is needed to support QtWebEngine 5.12 with Qt 5.11, a requirement that was raised too late. Change-Id: I758c46ed403620620d577ae16866ce751271b63e Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 95b0e4c956181e535d635b108adc732d8c91a803) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
-rw-r--r--mkspecs/features/qt_module.prf5
-rw-r--r--mkspecs/features/qt_module_headers.prf7
2 files changed, 7 insertions, 5 deletions
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index f8729de947..8c7adc45eb 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -13,8 +13,9 @@ 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)
+isEmpty(MODULE_CFG_FILE): MODULE_CFG_FILE = qt$${MODULE}-config
+exists($$OUT_PWD/$${MODULE_CFG_FILE}.pri) {
+ include($$OUT_PWD/$${MODULE_CFG_FILE}.pri)
CONFIG += generated_privates
}
diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf
index e45ac94966..bbded56b42 100644
--- a/mkspecs/features/qt_module_headers.prf
+++ b/mkspecs/features/qt_module_headers.prf
@@ -121,11 +121,12 @@ alien_syncqt: return()
MODULE_INC_OUTDIR = $$MODULE_BASE_OUTDIR/include/$$MODULE_INCNAME
-exists($$OUT_PWD/qt$${MODULE}-config.h) {
+isEmpty(MODULE_CFG_FILE): MODULE_CFG_FILE = qt$${MODULE}-config
+exists($$OUT_PWD/$${MODULE_CFG_FILE}.h) {
fwd_rel = $$relative_path($$OUT_PWD, $$MODULE_INC_OUTDIR)
SYNCQT.INJECTIONS += \
- $$fwd_rel/qt$${MODULE}-config.h:qt$${MODULE}-config.h \
- $$fwd_rel/qt$${MODULE}-config_p.h:$$MODULE_VERSION/$$MODULE_INCNAME/private/qt$${MODULE}-config_p.h
+ $$fwd_rel/$${MODULE_CFG_FILE}.h:$${MODULE_CFG_FILE}.h \
+ $$fwd_rel/$${MODULE_CFG_FILE}_p.h:$$MODULE_VERSION/$$MODULE_INCNAME/private/$${MODULE_CFG_FILE}_p.h
}
for (injection, SYNCQT.INJECTIONS) {