From c4888edfb84dc77fb25d46f468f0d11d5d1b4a89 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Mon, 23 Nov 2020 17:54:34 +0100 Subject: [PATCH] CMake: Change generated resources naming Align generated resources .qrc file naming to qmake naming. Update tests. Fixes: QTBUG-88581 Change-Id: Id8a2f91f23c257e5b8bd371748c2151ec54a6418 Reviewed-by: Alexandru Croitor (cherry picked from commit 2548438e326d20eda2eb4398139164f5400d22ac) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/Qt6CoreMacros.cmake | 2 +- .../test_add_resources_binary_generated/CMakeLists.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index b7fa7245f08..68c5ac4aa57 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -1166,7 +1166,7 @@ function(_qt_internal_process_resource target resourceName) return() endif() list(APPEND output_targets ${output_target_quick}) - set(generatedBaseName "generated_${newResourceName}") + set(generatedBaseName "${newResourceName}") set(generatedResourceFile "${CMAKE_CURRENT_BINARY_DIR}/.rcc/${generatedBaseName}.qrc") # Generate .qrc file: diff --git a/tests/auto/cmake/test_add_resources_binary_generated/CMakeLists.txt b/tests/auto/cmake/test_add_resources_binary_generated/CMakeLists.txt index c7839348a74..a764e68cc74 100644 --- a/tests/auto/cmake/test_add_resources_binary_generated/CMakeLists.txt +++ b/tests/auto/cmake/test_add_resources_binary_generated/CMakeLists.txt @@ -18,15 +18,15 @@ qt6_add_resources(test_add_resources_binary_generated resources2 FILES resource2 target_compile_definitions(test_add_resources_binary_generated 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 PRIVATE 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") endif() -if(NOT TARGET binary_resource_generated_resources2) +if(NOT TARGET binary_resource_resources2) message(FATAL_ERROR "Generated resources binary target was not created") endif()