From 4b698b33fd70515164d64364ee1d6aa7cedd75b2 Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Mon, 16 Sep 2019 14:05:26 +0200 Subject: Fix merge typo in QtResource.cmake.in Output target was named output_target_quick instead of just output_target Change-Id: I3ee0598bb61e654e42cb82b84da46f292d87e2cb Reviewed-by: Simon Hausmann --- cmake/QtResource.cmake.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cmake/QtResource.cmake.in') diff --git a/cmake/QtResource.cmake.in b/cmake/QtResource.cmake.in index 0c088bee8e..598294bec9 100644 --- a/cmake/QtResource.cmake.in +++ b/cmake/QtResource.cmake.in @@ -229,11 +229,11 @@ function(QT@PROJECT_VERSION_MAJOR@_PROCESS_RESOURCE target resourceName) if (NOT resources) if (rcc_OUTPUT_TARGETS) - set(${rcc_OUTPUT_TARGETS} "${output_target}" PARENT_SCOPE) + set(${rcc_OUTPUT_TARGETS} "${output_target_quick}" PARENT_SCOPE) endif() return() endif() - list(APPEND output_targets ${output_target}) + list(APPEND output_targets ${output_target_quick}) set(generatedResourceFile "${CMAKE_CURRENT_BINARY_DIR}/generated_${newResourceName}.qrc") set(generatedSourceCode "${CMAKE_CURRENT_BINARY_DIR}/qrc_${newResourceName}.cpp") -- cgit v1.2.3