From 1496a88429e0745fa7fdfacd575f85648472c35c Mon Sep 17 00:00:00 2001
From: Leander Beernaert <leander.beernaert@qt.io>
Date: Wed, 18 Sep 2019 16:18:32 +0200
Subject: [PATCH] Fix QtDeclcarative static builds

Incorrect variable name was being used to set the target in the parent
scope.

Change-Id: I73ea644ebf94c9b9a62b34b1ad493e488729ff2f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 cmake/QtBuild.cmake       | 10 ++++------
 cmake/QtResource.cmake.in |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index 425bdd8270..11a4b66e3f 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -2009,12 +2009,10 @@ function(add_qt_resource target resourceName)
    )
 
    if (out_targets)
-        foreach(out_target IN LISTS out_targets)
-            qt_install(TARGETS "${out_target}"
-                EXPORT "${INSTALL_CMAKE_NAMESPACE}${target}Targets"
-                DESTINATION ${INSTALL_LIBDIR}
-            )
-        endforeach()
+        qt_install(TARGETS ${out_targets}
+            EXPORT "${INSTALL_CMAKE_NAMESPACE}${target}Targets"
+            DESTINATION ${INSTALL_LIBDIR}
+        )
    endif()
 
 endfunction()
diff --git a/cmake/QtResource.cmake.in b/cmake/QtResource.cmake.in
index 598294bec9..ef70ac3b88 100644
--- a/cmake/QtResource.cmake.in
+++ b/cmake/QtResource.cmake.in
@@ -224,7 +224,7 @@ function(QT@PROJECT_VERSION_MAJOR@_PROCESS_RESOURCE target resourceName)
         PREFIX ${rcc_PREFIX}
         OUTPUT_REMAINING_RESOURCES resources
         OUTPUT_RESOURCE_NAME newResourceName
-        OUTPUT_GENERATED_TARGET output_target
+        OUTPUT_GENERATED_TARGET output_target_quick
     )
 
     if (NOT resources)