From de1d3a3e1c5e8748c31c83f73b771f2f6b1b1bc7 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Wed, 17 Feb 2021 13:43:36 +0100
Subject: CMake: Fix dependencies between metatypes and qmltypes

qmltyperegistrar needs all the metatypes declared in the foreign types
file. Otherwise it produces incomplete output.

Change-Id: I5876ca9add59fafa54e2d2e6eb2de058c9595870
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit ce950d619aef3ad0534544b2e029a6f025b256a5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/qml/Qt6QmlMacros.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake
index 9e559f8755..c86bcb1cb8 100644
--- a/src/qml/Qt6QmlMacros.cmake
+++ b/src/qml/Qt6QmlMacros.cmake
@@ -831,6 +831,7 @@ function(qt6_qml_type_registration target)
             ${foreign_types_file}
             ${target_metatypes_json_file}
             ${QT_CMAKE_EXPORT_NAMESPACE}::qmltyperegistrar
+            "$<$<BOOL:${genex_list}>:${genex_list}>"
         ${extra_env_command}
         COMMAND
             $<TARGET_FILE:${QT_CMAKE_EXPORT_NAMESPACE}::qmltyperegistrar>
-- 
cgit v1.2.3