diff options
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_module.prf | 5 | ||||
| -rw-r--r-- | mkspecs/features/qt_module_headers.prf | 11 |
2 files changed, 9 insertions, 7 deletions
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index cd8b41d36d..d4b660b77a 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 38e293db9e..72471d7a01 100644 --- a/mkspecs/features/qt_module_headers.prf +++ b/mkspecs/features/qt_module_headers.prf @@ -123,13 +123,14 @@ 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 - SYNCQT.INJECTED_HEADER_FILES += $$OUT_PWD/qt$${MODULE}-config.h - SYNCQT.INJECTED_PRIVATE_HEADER_FILES += $$OUT_PWD/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 + SYNCQT.INJECTED_HEADER_FILES += $$OUT_PWD/$${MODULE_CFG_FILE}.h + SYNCQT.INJECTED_PRIVATE_HEADER_FILES += $$OUT_PWD/$${MODULE_CFG_FILE}_p.h } for (injection, SYNCQT.INJECTIONS) { |