aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2021-02-26 13:47:49 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-03-11 07:56:53 +0000
commit6e788bd112f2d5c64b40b2f3e79a24a80ca5d0f5 (patch)
tree8f5b51de22b3a7d4cd09b500e37f83f86efdf654
parent85cdc455588cc7478ea1ac13b6202ef4bbc71220 (diff)
Fix the argument removal in qt_internal_add_qml_module
We need to remove all the QML-specific arguments. Change-Id: I99a1712251c5cf9cb6dfe399a2f1177d435a2af7 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 078bf865360391d960421cacc5e0d58a6bb07a11) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/qml/Qt6QmlBuildInternals.cmake4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/Qt6QmlBuildInternals.cmake b/src/qml/Qt6QmlBuildInternals.cmake
index 161c90644d..c2d8259bc0 100644
--- a/src/qml/Qt6QmlBuildInternals.cmake
+++ b/src/qml/Qt6QmlBuildInternals.cmake
@@ -66,10 +66,12 @@ function(qt_internal_add_qml_module target)
qt_remove_args(plugin_args
ARGS_TO_REMOVE
${target}
- ${qml_module_multi_args}
+ ${qml_module_optional_args}
${qml_module_single_args}
+ ${qml_module_multi_args}
ALL_ARGS
${__qt_add_plugin_optional_args}
+ ${qml_module_optional_args}
${__qt_add_plugin_single_args}
${qml_module_single_args}
${__qt_add_plugin_multi_args}