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

Fix merge typo in QtResource.cmake.in

Browse Source 
Output target was named output_target_quick instead of just output_target

Change-Id: I3ee0598bb61e654e42cb82b84da46f292d87e2cb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Leander Beernaert 2019-09-16 14:05:26 +02:00
parent 21dd3624a5
commit 4b698b33fd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/QtResource.cmake.in
View File

@ -229,11 +229,11 @@ function(QT@PROJECT_VERSION_MAJOR@_PROCESS_RESOURCE target resourceName)
if (NOT resources) if (NOT resources)
if (rcc_OUTPUT_TARGETS) if (rcc_OUTPUT_TARGETS)
set(${rcc_OUTPUT_TARGETS} "${output_target}" PARENT_SCOPE) set(${rcc_OUTPUT_TARGETS} "${output_target_quick}" PARENT_SCOPE)
endif() endif()
return() return()
endif() endif()
list(APPEND output_targets ${output_target}) list(APPEND output_targets ${output_target_quick})
set(generatedResourceFile "${CMAKE_CURRENT_BINARY_DIR}/generated_${newResourceName}.qrc") set(generatedResourceFile "${CMAKE_CURRENT_BINARY_DIR}/generated_${newResourceName}.qrc")
set(generatedSourceCode "${CMAKE_CURRENT_BINARY_DIR}/qrc_${newResourceName}.cpp") set(generatedSourceCode "${CMAKE_CURRENT_BINARY_DIR}/qrc_${newResourceName}.cpp")