diff options
| -rw-r--r-- | mkspecs/features/qt_module.prf | 5 | ||||
| -rw-r--r-- | mkspecs/features/qt_module_headers.prf | 7 |
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) { |