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

Avoid implicit linking of plugin init library if finalizers were called

Browse Source 
Propagating of plugin init libraries should take into account
plugin finalizers to avoid duplicating of object files in a linker
line.

Pick-to: 6.2
Fixes: QTBUG-96062
Change-Id: I48feac94b08a7eb08d84134e9e9ae6e7214f5bdd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexey Edelev 2021-09-07 19:42:49 +02:00
parent 400a7c540e
commit 7e794d71c0
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtPublicPluginHelpers.cmake
View File

@ -198,6 +198,8 @@ function(__qt_internal_add_static_plugin_import_macro
__qt_internal_propagate_object_library(
"${QT_CMAKE_EXPORT_NAMESPACE}::${plugin_target}"
"${plugin_init_target_namespaced}"
EXTRA_CONDITIONS
"$<NOT:$<BOOL:$<TARGET_PROPERTY:_qt_static_plugins_finalizer_mode>>>"
)
endfunction()