From 98e6234bd4a910ab1b3873bafc9da33aab499e2e Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Thu, 19 Nov 2020 15:35:28 +0100 Subject: CMake: Generate less pri files and mark header modules as no_link Plugins will no longer get .pri files generated in non-static builds. Header modules are now marked in the .pri files as CONFIG += no_link. Pick-to: 6.0 6.0.0 Fixes: QTBUG-88221 Change-Id: I06e31fa970ad021261c43ca3acd88055cc4c9555 Reviewed-by: Alexandru Croitor --- cmake/QtPriHelpers.cmake | 3 +++ 1 file changed, 3 insertions(+) (limited to 'cmake/QtPriHelpers.cmake') diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake index 2dbacc59e6..7d4b6143ec 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake @@ -186,6 +186,9 @@ function(qt_generate_module_pri_file target) get_target_property(config_module_name ${target} _qt_config_module_name) get_target_property(qmake_module_config ${target} ${property_prefix}QT_QMAKE_MODULE_CONFIG) + if (arg_HEADER_MODULE) + list(APPEND qmake_module_config "no_link") + endif() if(qmake_module_config) string(REPLACE ";" " " module_build_config "${qmake_module_config}") set(module_build_config "\nQT.${config_module_name}.CONFIG = ${module_build_config}") -- cgit v1.2.3