From d95c3cd99a8f452d2ebd0a9fd4153bc4735e50a1 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Thu, 28 Mar 2024 10:59:31 +0100 Subject: [PATCH] Consider the versioned Qt6::Gui when target when adding the plugin dependencies QtGui module can be linked using both versioned and non versioned targets. Consider this when adding the dependencies to the qpa_default_plugins targets. Change-Id: Iccbf3009ab8a4f9df4de1677f1b41445814c8c9e Reviewed-by: Alexandru Croitor (cherry picked from commit 1e8a36e360d7e86b86db7ba7a7cc258f65348929) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtExecutableHelpers.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/QtExecutableHelpers.cmake b/cmake/QtExecutableHelpers.cmake index f4380291f70..422e813d5e9 100644 --- a/cmake/QtExecutableHelpers.cmake +++ b/cmake/QtExecutableHelpers.cmake @@ -217,7 +217,8 @@ function(qt_internal_add_executable name) # This makes the experience of an initial Qt configuration to build and run one single # test / executable nicer. get_target_property(linked_libs "${name}" LINK_LIBRARIES) - if("Qt::Gui" IN_LIST linked_libs AND TARGET qpa_default_plugins) + if(linked_libs MATCHES "(^|;)(${QT_CMAKE_EXPORT_NAMESPACE}::|Qt::)?Gui($|;)" AND + TARGET qpa_default_plugins) add_dependencies("${name}" qpa_default_plugins) endif()