Skip to content

Commit

Permalink
CMake: Fix resource_name variable name in __qt_propagate_generated_re…
Browse files Browse the repository at this point in the history
…source

__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 <[email protected]>
  • Loading branch information
semlanik committed Nov 20, 2020
1 parent 1a0ae4e commit eaedd7e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/corelib/Qt6CoreMacros.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit eaedd7e

Please sign in to comment.