From 29789ff0eabc2ea91a21526c475e5a8c0126a7af Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Fri, 18 Jun 2021 10:03:02 +0200 Subject: [PATCH] Use target OUTPUT_NAME as a module identifier in .pri files QtPriHelpers copies the logic related to the module OUTPUT_NAME to produce a module identifier. Since the module identifier should be equal to OUTPUT_NAME it makes sense to reuse the property and deduplicate logic. Amends 8aee7c6b29be5a0ee7d5e7cfcb5f2db762b2e28b Pick-to: 6.2 Fixes: QTBUG-94568 Change-Id: I8d9c04273e4cdb1a2e6a3b0db3ddf52e008c0cf7 Reviewed-by: Alexandru Croitor --- cmake/QtPriHelpers.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake index 599ccb8c4d4..cfb5e85dc63 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake @@ -221,18 +221,16 @@ function(qt_generate_module_pri_file target) set(public_module_frameworks "${framework_base_path}") set(private_module_includes "${framework_base_path}/${fw_private_header_dir} \ ${framework_base_path}/${fw_private_module_header_dir}") - set(module_name_in_pri "${module}") else() set(public_module_includes "$$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/${module}") set(public_module_frameworks "") set(private_module_includes "$$QT_MODULE_INCLUDE_BASE/${module}/${PROJECT_VERSION} $$QT_MODULE_INCLUDE_BASE/${module}/${PROJECT_VERSION}/${module}") - set(module_name_in_pri "${module_versioned}") endif() if(arg_HEADER_MODULE) set(module_name_in_pri "") else() - set(module_name_in_pri "${module_name_in_pri}${QT_LIBINFIX}") + get_target_property(module_name_in_pri ${target} OUTPUT_NAME) endif() get_target_property(hasModuleHeaders ${target} INTERFACE_MODULE_HAS_HEADERS)