From 5d40bebc85c0686fd08d6b41cccb205a245431c8 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 6 Jul 2022 11:00:15 +0200 Subject: [PATCH] Fix potentially wrong version in Windows resources of Qt plugins qt_internal_add_plugin calls qt_set_target_info_properties with the TARGET_VERSION argument and passes arg_VERSION. However, the function qt_internal_add_plugin does not have a VERSION argument. If arg_VERSION is set before calling qt_internal_add_plugin, that value will be used, and that could be wrong for the plugin. Remove the TARGET_VERSION argument from the qt_set_target_info_properties call. Change-Id: I0ae9e0e6636d74fdc20e6ab9ca525c5a9126000c Reviewed-by: Alexandru Croitor (cherry picked from commit df764df3ea6264fd8e7ccdbd32ce11b2bcf26982) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtPluginHelpers.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/QtPluginHelpers.cmake b/cmake/QtPluginHelpers.cmake index 03ff7de1c97..c789569c9f5 100644 --- a/cmake/QtPluginHelpers.cmake +++ b/cmake/QtPluginHelpers.cmake @@ -117,7 +117,7 @@ function(qt_internal_add_plugin target) endif() endif() - qt_set_target_info_properties(${target} ${ARGN} TARGET_VERSION "${arg_VERSION}") + qt_set_target_info_properties(${target} ${ARGN}) # Override the OUTPUT_NAME that qt6_add_plugin() set, we need to account for # QT_LIBINFIX, which is specific to building Qt.