diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2020-11-20 12:49:53 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2020-11-20 15:29:32 +0100 |
| commit | eaedd7efbf5f97be585437ad2d358c43c155204f (patch) | |
| tree | af0ec85de81e768f341d9d73c3776d14385cf7eb /src/corelib | |
| parent | 1a0ae4e32d9bbcd152c953dd672e90cfe93c01bc (diff) | |
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.
Pick-to: 6.0.0 6.0
Change-Id: I18ce8a9f9c01bcfdbab532def55af4e2780d7753
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/Qt6CoreMacros.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index a200dd6c32..b7fa7245f0 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 |