1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Change generated resources naming

Browse Source 
Align generated resources .qrc file naming to qmake naming.
Update tests.

Fixes: QTBUG-88581
Change-Id: Id8a2f91f23c257e5b8bd371748c2151ec54a6418
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 2548438e326d20eda2eb4398139164f5400d22ac)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexey Edelev 2020-11-23 17:54:34 +01:00 committed by Qt Cherry-pick Bot
parent adf6f02bb0
commit c4888edfb8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/Qt6CoreMacros.cmake
View File

@ -1166,7 +1166,7 @@ function(_qt_internal_process_resource target resourceName)
return() return()
endif() endif()
list(APPEND output_targets ${output_target_quick}) list(APPEND output_targets ${output_target_quick})
set(generatedBaseName "generated_${newResourceName}") set(generatedBaseName "${newResourceName}")
set(generatedResourceFile "${CMAKE_CURRENT_BINARY_DIR}/.rcc/${generatedBaseName}.qrc") set(generatedResourceFile "${CMAKE_CURRENT_BINARY_DIR}/.rcc/${generatedBaseName}.qrc")
# Generate .qrc file: # Generate .qrc file:

6
tests/auto/cmake/test_add_resources_binary_generated/CMakeLists.txt
View File

@ -18,15 +18,15 @@ qt6_add_resources(test_add_resources_binary_generated resources2 FILES resource2
target_compile_definitions(test_add_resources_binary_generated target_compile_definitions(test_add_resources_binary_generated
PRIVATE PRIVATE
RESOURCE1_FULL_PATH="${CMAKE_CURRENT_BINARY_DIR}/generated_resources1.rcc") RESOURCE1_FULL_PATH="${CMAKE_CURRENT_BINARY_DIR}/resources1.rcc")
target_compile_definitions(test_add_resources_binary_generated target_compile_definitions(test_add_resources_binary_generated
PRIVATE PRIVATE
RESOURCE2_FULL_PATH="${CMAKE_CURRENT_BINARY_DIR}/resources2_custom.rcc") RESOURCE2_FULL_PATH="${CMAKE_CURRENT_BINARY_DIR}/resources2_custom.rcc")
if(NOT TARGET binary_resource_generated_resources1) if(NOT TARGET binary_resource_resources1)
message(FATAL_ERROR "Generated resources binary target was not created") message(FATAL_ERROR "Generated resources binary target was not created")
endif() endif()
if(NOT TARGET binary_resource_generated_resources2) if(NOT TARGET binary_resource_resources2)
message(FATAL_ERROR "Generated resources binary target was not created") message(FATAL_ERROR "Generated resources binary target was not created")
endif() endif()