From 95b0e4c956181e535d635b108adc732d8c91a803 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 2 May 2018 18:07:05 +0200 Subject: 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. Change-Id: I758c46ed403620620d577ae16866ce751271b63e Reviewed-by: Michal Klocek Reviewed-by: Allan Sandfeld Jensen --- mkspecs/features/qt_module.prf | 5 +++-- mkspecs/features/qt_module_headers.prf | 11 ++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'mkspecs') 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) { -- cgit v1.2.3