diff options
| -rw-r--r-- | cmake/QtPriHelpers.cmake | 5 | ||||
| -rw-r--r-- | mkspecs/features/qt_module_pris.prf | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake index 56c60b1b18..80440e15a1 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake @@ -148,9 +148,11 @@ function(qt_generate_module_pri_file target) "${property_prefix}QT_MODULE_INTERNAL_CONFIG") get_target_property(module_uses "${target}" "${property_prefix}QT_MODULE_USES") + get_target_property(module_pri_extra_content "${target}" + "${property_prefix}QT_MODULE_PRI_EXTRA_CONTENT") foreach(var enabled_features disabled_features enabled_private_features disabled_private_features - module_internal_config module_uses) + module_internal_config module_uses module_pri_extra_content) if(${var} STREQUAL "${var}-NOTFOUND") set(${var} "") else() @@ -274,6 +276,7 @@ QT.${config_module_name}.enabled_features = ${enabled_features} QT.${config_module_name}.disabled_features = ${disabled_features}${extra_assignments} QT_CONFIG += ${enabled_features} QT_MODULES += ${config_module_name_base} +${module_pri_extra_content} " ) diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf index a8cc9835a5..9b632a864f 100644 --- a/mkspecs/features/qt_module_pris.prf +++ b/mkspecs/features/qt_module_pris.prf @@ -153,7 +153,8 @@ defineReplace(qtExportLibsForModule) { $$qtGetExportsForModule($$MODULE_ID) \ "QT_CONFIG +=$$join(QT.$${MODULE_ID}.QT_CONFIG, " ", " ")" \ "" \ - "QT_MODULES += $$MODULE" + "QT_MODULES += $$MODULE" \ + "$$MODULE_PRI_EXTRA_CONTENT" write_file($$MODULE_PRI, MODULE_PRI_CONT)|error() !internal_module:!no_private_module { module_build_type += internal_module |