1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix potentially wrong version in Windows resources of Qt plugins

Browse Source 
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 <alexandru.croitor@qt.io>
(cherry picked from commit df764df3ea6264fd8e7ccdbd32ce11b2bcf26982)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Joerg Bornemann 2022-07-06 11:00:15 +02:00 committed by Qt Cherry-pick Bot
parent 624f69e7a7
commit 5d40bebc85
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtPluginHelpers.cmake
View File

@ -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.