From 72c31006a951688ae830a250dc3f9a0a99a0a72c Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Fri, 20 Nov 2020 12:49:53 +0100 Subject: [PATCH] CMake: Fix resource_name variable name in __qt_propagate_generated_resource __qt_propagate_generated_resource used resourceName variable from parent scope instead of one passed to function. Change-Id: I18ce8a9f9c01bcfdbab532def55af4e2780d7753 Reviewed-by: Alexandru Croitor (cherry picked from commit eaedd7efbf5f97be585437ad2d358c43c155204f) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/Qt6CoreMacros.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index a200dd6c325..b7fa7245f08 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -1059,9 +1059,9 @@ endfunction() function(__qt_propagate_generated_resource target resource_name generated_source_code output_generated_target) get_target_property(type ${target} TYPE) if(type STREQUAL STATIC_LIBRARY) - set(resource_target "${target}_resources_${resourceName}") + set(resource_target "${target}_resources_${resource_name}") add_library("${resource_target}" OBJECT "${generated_source_code}") - set_property(TARGET ${resource_target} APPEND PROPERTY _qt_resource_name ${resourceName}) + set_property(TARGET ${resource_target} APPEND PROPERTY _qt_resource_name ${resource_name}) # Use TARGET_NAME genex to map to the correct prefixed target name when it is exported # via qt_install(EXPORT), so that the consumers of the target can find the object library