diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2024-03-28 10:59:31 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2024-05-08 13:31:23 +0200 |
| commit | 1e8a36e360d7e86b86db7ba7a7cc258f65348929 (patch) | |
| tree | 0c409e012f3c09998706811c3c22734c68fa566b /cmake/QtExecutableHelpers.cmake | |
| parent | c7176f3142a887af13cae856a826fcd40d132515 (diff) | |
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.
Pick-to: 6.7
Change-Id: Iccbf3009ab8a4f9df4de1677f1b41445814c8c9e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtExecutableHelpers.cmake')
| -rw-r--r-- | cmake/QtExecutableHelpers.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/QtExecutableHelpers.cmake b/cmake/QtExecutableHelpers.cmake index ceb330e2a85..1b9200e3137 100644 --- a/cmake/QtExecutableHelpers.cmake +++ b/cmake/QtExecutableHelpers.cmake @@ -212,7 +212,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() endfunction() |