From 7e794d71c0bf0f6e812aa1c7794b709889f202fd Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Tue, 7 Sep 2021 19:42:49 +0200 Subject: [PATCH] Avoid implicit linking of plugin init library if finalizers were called 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 --- cmake/QtPublicPluginHelpers.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/QtPublicPluginHelpers.cmake b/cmake/QtPublicPluginHelpers.cmake index cbe8a5c8aae..a5b1125e4f7 100644 --- a/cmake/QtPublicPluginHelpers.cmake +++ b/cmake/QtPublicPluginHelpers.cmake @@ -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 + "$>>" ) endfunction()