CMake: Don't give plugins PUBLIC usage requirements

The pro2cmake.py conversion script faithfully reproduced the .pro files
for the plugins, which specified the libraries as public. But in CMake,
the implications of this are that public usage requirements should then
be propagated to consumers. We don't expect any consumers, since a
plugin is created as a MODULE library in CMake, so for Windows we don't
even have an import library to link with. The only exception to this is
for static builds where plugins are created as STATIC libraries
instead, but only in certain controlled situations do we then link to
plugins. Even then, usage requirements are not expected to propagate to
the consumers, so these relationships should always be specified as
private.

Pick-to: 6.2
Task-number: QTBUG-90819
Change-Id: Ia7a8f27d4eecf067055511577ec664ad857905cd
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

25 files changed, 29 insertions, 37 deletions

diff --git a/src/plugins/decorations/bradient/CMakeLists.txt b/src/plugins/decorations/bradient/CMakeLists.txt
index 0384eefc..a914ea3c 100644
--- a/src/plugins/decorations/bradient/CMakeLists.txt
+++ b/src/plugins/decorations/bradient/CMakeLists.txt
@@ -9,7 +9,7 @@ qt_internal_add_plugin(QWaylandBradientDecorationPlugin
     TYPE wayland-decoration-client
     SOURCES
         main.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Core
         Qt::Gui
         Qt::WaylandClientPrivate
diff --git a/src/plugins/hardwareintegration/client/dmabuf-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/dmabuf-server/CMakeLists.txt
index bda31db0..8476ef7b 100644
--- a/src/plugins/hardwareintegration/client/dmabuf-server/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/dmabuf-server/CMakeLists.txt
@@ -12,7 +12,7 @@ qt_internal_add_plugin(DmaBufServerBufferPlugin
         main.cpp
     INCLUDE_DIRECTORIES
         ../../../../hardwareintegration/client/dmabuf-server
-    PUBLIC_LIBRARIES
+    LIBRARIES
         EGL::EGL
         Qt::Core
         Qt::Gui
diff --git a/src/plugins/hardwareintegration/client/drm-egl-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/drm-egl-server/CMakeLists.txt
index b2eabcf4..5e0b08d0 100644
--- a/src/plugins/hardwareintegration/client/drm-egl-server/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/drm-egl-server/CMakeLists.txt
@@ -12,7 +12,7 @@ qt_internal_add_plugin(DrmEglServerBufferPlugin
         main.cpp
     INCLUDE_DIRECTORIES
         ../../../../hardwareintegration/client/drm-egl-server
-    PUBLIC_LIBRARIES
+    LIBRARIES
         EGL::EGL
         Qt::Core
         Qt::Gui
diff --git a/src/plugins/hardwareintegration/client/shm-emulation-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/shm-emulation-server/CMakeLists.txt
index 6b68ab8e..326dd825 100644
--- a/src/plugins/hardwareintegration/client/shm-emulation-server/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/shm-emulation-server/CMakeLists.txt
@@ -12,7 +12,7 @@ qt_internal_add_plugin(ShmServerBufferPlugin
         main.cpp
     INCLUDE_DIRECTORIES
         ../../../../hardwareintegration/client/shm-emulation-server
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Core
         Qt::Gui
         Qt::OpenGL
diff --git a/src/plugins/hardwareintegration/client/vulkan-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/vulkan-server/CMakeLists.txt
index 3cfde468..bda421ed 100644
--- a/src/plugins/hardwareintegration/client/vulkan-server/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/vulkan-server/CMakeLists.txt
@@ -12,7 +12,7 @@ qt_internal_add_plugin(VulkanServerBufferPlugin
         main.cpp
     INCLUDE_DIRECTORIES
         ../../../../hardwareintegration/client/vulkan-server
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Core
         Qt::Gui
         Qt::OpenGL
diff --git a/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt b/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt
index 5baeb716..a3062eec 100644
--- a/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt
@@ -10,7 +10,7 @@ qt_internal_add_plugin(QWaylandEglClientBufferPlugin
     TYPE wayland-graphics-integration-client
     SOURCES
         main.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Core
         Qt::Gui
         Qt::WaylandClientPrivate
diff --git a/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt b/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt
index 9b7324cc..fa61db72 100644
--- a/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_plugin(QWaylandXCompositeEglClientBufferPlugin
     INCLUDE_DIRECTORIES
         ../../../../hardwareintegration/client/xcomposite-egl
         ../../../../hardwareintegration/client/xcomposite_share
-    PUBLIC_LIBRARIES
+    LIBRARIES
         EGL::EGL
         PkgConfig::XComposite
         Qt::Core
diff --git a/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt b/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt
index 0f0ea073..819f10eb 100644
--- a/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt
@@ -16,7 +16,7 @@ qt_internal_add_plugin(QWaylandXCompositeGlxClientBufferPlugin
     INCLUDE_DIRECTORIES
         ../../../../hardwareintegration/client/xcomposite-glx
         ../../../../hardwareintegration/client/xcomposite_share
-    PUBLIC_LIBRARIES
+    LIBRARIES
         ${CMAKE_DL_LIBS}
         PkgConfig::XComposite
         Qt::Core
diff --git a/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt
index e4867172..b3ffcb81 100644
--- a/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt
@@ -15,12 +15,11 @@ qt_internal_add_plugin(DmaBufServerBufferIntegrationPlugin
     LIBRARIES
         EGL::EGL
         Libdrm::Libdrm
-        Wayland::Server
-    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
         Qt::WaylandCompositor
         Qt::WaylandCompositorPrivate
+        Wayland::Server
 )
 
 qt6_generate_wayland_protocol_server_sources(DmaBufServerBufferIntegrationPlugin
diff --git a/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt
index af4eb745..61c9c30c 100644
--- a/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt
@@ -14,12 +14,11 @@ qt_internal_add_plugin(DrmEglServerBufferIntegrationPlugin
         ../../../../hardwareintegration/compositor/drm-egl-server
     LIBRARIES
         EGL::EGL
-        Wayland::Server
-    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
         Qt::WaylandCompositor
         Qt::WaylandCompositorPrivate
+        Wayland::Server
 )
 
 qt6_generate_wayland_protocol_server_sources(DrmEglServerBufferIntegrationPlugin
diff --git a/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt
index 6061fce4..12f41128 100644
--- a/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt
@@ -17,7 +17,6 @@ qt_internal_add_plugin(QWaylandDmabufClientBufferIntegrationPlugin
         EGL::EGL
         Libdrm::Libdrm
         Wayland::Server
-    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
         Qt::WaylandCompositor
diff --git a/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt
index 0887c517..2fd08b51 100644
--- a/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt
@@ -13,12 +13,11 @@ qt_internal_add_plugin(ShmServerBufferIntegrationPlugin
     INCLUDE_DIRECTORIES
         ../../../../hardwareintegration/compositor/shm-emulation-server
     LIBRARIES
-        Wayland::Server
-    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
         Qt::WaylandCompositor
         Qt::WaylandCompositorPrivate
+        Wayland::Server
 )
 
 qt6_generate_wayland_protocol_server_sources(ShmServerBufferIntegrationPlugin
diff --git a/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt
index 661cdac9..5ebc0dac 100644
--- a/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt
@@ -15,13 +15,12 @@ qt_internal_add_plugin(VulkanServerBufferIntegrationPlugin
         ../../../../hardwareintegration/compositor/vulkan-server
         ../../../../hardwareintegration/compositor/vulkan-server/../../../3rdparty/util
     LIBRARIES
-        Wayland::Server
-    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
         Qt::OpenGLPrivate
         Qt::WaylandCompositor
         Qt::WaylandCompositorPrivate
+        Wayland::Server
 )
 
 qt6_generate_wayland_protocol_server_sources(VulkanServerBufferIntegrationPlugin
diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt
index 69b3d3d2..db3ee633 100644
--- a/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt
@@ -10,7 +10,7 @@ qt_internal_add_plugin(QWaylandEglClientBufferIntegrationPlugin
     TYPE wayland-graphics-integration-server
     SOURCES
         main.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
         Qt::WaylandCompositor
diff --git a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt
index af8d167a..d36e69e5 100644
--- a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt
@@ -16,13 +16,12 @@ qt_internal_add_plugin(QWaylandEglStreamClientBufferIntegrationPlugin
         ../../../../hardwareintegration/compositor/wayland-eglstream-controller
     LIBRARIES
         EGL::EGL
-        Wayland::Egl
-        Wayland::Server
-    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
         Qt::WaylandCompositor
         Qt::WaylandCompositorPrivate
+        Wayland::Egl
+        Wayland::Server
 )
 
 qt6_generate_wayland_protocol_server_sources(QWaylandEglStreamClientBufferIntegrationPlugin
diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt
index 28a1c155..de75ba7c 100644
--- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt
@@ -19,9 +19,6 @@ qt_internal_add_plugin(QWaylandXCompositeEglClientBufferIntegrationPlugin
         ../../../../hardwareintegration/compositor/xcomposite_share
     LIBRARIES
         EGL::EGL
-        Wayland::Server
-        X11::X11
-    PUBLIC_LIBRARIES
         PkgConfig::XComposite
         Qt::Core
         Qt::CorePrivate
@@ -29,6 +26,8 @@ qt_internal_add_plugin(QWaylandXCompositeEglClientBufferIntegrationPlugin
         Qt::GuiPrivate
         Qt::WaylandCompositor
         Qt::WaylandCompositorPrivate
+        Wayland::Server
+        X11::X11
 )
 
 qt6_generate_wayland_protocol_server_sources(QWaylandXCompositeEglClientBufferIntegrationPlugin
diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt
index c32b25ba..cc8e0281 100644
--- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt
@@ -17,9 +17,6 @@ qt_internal_add_plugin(QWaylandXCompositeGlxClientBufferIntegrationPlugin
         ../../../../hardwareintegration/compositor/xcomposite-glx
         ../../../../hardwareintegration/compositor/xcomposite_share
     LIBRARIES
-        Wayland::Server
-        X11::X11
-    PUBLIC_LIBRARIES
         PkgConfig::XComposite
         Qt::Core
         Qt::CorePrivate
@@ -27,6 +24,8 @@ qt_internal_add_plugin(QWaylandXCompositeGlxClientBufferIntegrationPlugin
         Qt::GuiPrivate
         Qt::WaylandCompositor
         Qt::WaylandCompositorPrivate
+        Wayland::Server
+        X11::X11
 )
 
 qt6_generate_wayland_protocol_server_sources(QWaylandXCompositeGlxClientBufferIntegrationPlugin
diff --git a/src/plugins/platforms/qwayland-egl/CMakeLists.txt b/src/plugins/platforms/qwayland-egl/CMakeLists.txt
index a6c9408a..1f5ee412 100644
--- a/src/plugins/platforms/qwayland-egl/CMakeLists.txt
+++ b/src/plugins/platforms/qwayland-egl/CMakeLists.txt
@@ -10,7 +10,7 @@ qt_internal_add_plugin(QWaylandEglPlatformIntegrationPlugin
     TYPE platforms
     SOURCES
         main.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Core
         Qt::Gui
         Qt::WaylandClientPrivate
diff --git a/src/plugins/platforms/qwayland-generic/CMakeLists.txt b/src/plugins/platforms/qwayland-generic/CMakeLists.txt
index 0c2bb080..f246983f 100644
--- a/src/plugins/platforms/qwayland-generic/CMakeLists.txt
+++ b/src/plugins/platforms/qwayland-generic/CMakeLists.txt
@@ -10,7 +10,7 @@ qt_internal_add_plugin(QWaylandIntegrationPlugin
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES wayland # special case
     SOURCES
         main.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Core
         Qt::Gui
         Qt::WaylandClientPrivate
diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/CMakeLists.txt b/src/plugins/platforms/qwayland-xcomposite-egl/CMakeLists.txt
index b9363707..0b3afc68 100644
--- a/src/plugins/platforms/qwayland-xcomposite-egl/CMakeLists.txt
+++ b/src/plugins/platforms/qwayland-xcomposite-egl/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_plugin(QWaylandXCompositeEglPlatformIntegrationPlugin
     INCLUDE_DIRECTORIES
         ../../../hardwareintegration/client/xcomposite-egl
         ../../../hardwareintegration/client/xcomposite_share
-    PUBLIC_LIBRARIES
+    LIBRARIES
         EGL::EGL
         PkgConfig::XComposite
         Qt::Core
diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/CMakeLists.txt b/src/plugins/platforms/qwayland-xcomposite-glx/CMakeLists.txt
index f41af9f4..9e31e73e 100644
--- a/src/plugins/platforms/qwayland-xcomposite-glx/CMakeLists.txt
+++ b/src/plugins/platforms/qwayland-xcomposite-glx/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_plugin(QWaylandXCompositeGlxPlatformIntegrationPlugin
     INCLUDE_DIRECTORIES
         ../../../hardwareintegration/client/xcomposite-glx
         ../../../hardwareintegration/client/xcomposite_share
-    PUBLIC_LIBRARIES
+    LIBRARIES
         ${CMAKE_DL_LIBS}
         PkgConfig::XComposite
         Qt::Core
diff --git a/src/plugins/shellintegration/fullscreen-shell-v1/CMakeLists.txt b/src/plugins/shellintegration/fullscreen-shell-v1/CMakeLists.txt
index 686cfbcb..b4b73cdc 100644
--- a/src/plugins/shellintegration/fullscreen-shell-v1/CMakeLists.txt
+++ b/src/plugins/shellintegration/fullscreen-shell-v1/CMakeLists.txt
@@ -11,7 +11,7 @@ qt_internal_add_plugin(QWaylandFullScreenShellV1IntegrationPlugin
         main.cpp
         qwaylandfullscreenshellv1integration.cpp qwaylandfullscreenshellv1integration.h
         qwaylandfullscreenshellv1surface.cpp qwaylandfullscreenshellv1surface.h
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Core
         Qt::Gui
         Qt::GuiPrivate
diff --git a/src/plugins/shellintegration/ivi-shell/CMakeLists.txt b/src/plugins/shellintegration/ivi-shell/CMakeLists.txt
index 29316195..7843a22e 100644
--- a/src/plugins/shellintegration/ivi-shell/CMakeLists.txt
+++ b/src/plugins/shellintegration/ivi-shell/CMakeLists.txt
@@ -11,7 +11,7 @@ qt_internal_add_plugin(QWaylandIviShellIntegrationPlugin
         main.cpp
         qwaylandivishellintegration.cpp qwaylandivishellintegration.h
         qwaylandivisurface.cpp qwaylandivisurface_p.h
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Core
         Qt::Gui
         Qt::GuiPrivate
@@ -32,6 +32,6 @@ qt6_generate_wayland_protocol_client_sources(QWaylandIviShellIntegrationPlugin
 #####################################################################
 
 qt_internal_extend_target(QWaylandIviShellIntegrationPlugin CONDITION QT_FEATURE_xkbcommon
-    PUBLIC_LIBRARIES
+    LIBRARIES
         XKB::XKB
 )
diff --git a/src/plugins/shellintegration/wl-shell/CMakeLists.txt b/src/plugins/shellintegration/wl-shell/CMakeLists.txt
index d7c052fa..85ed7b0a 100644
--- a/src/plugins/shellintegration/wl-shell/CMakeLists.txt
+++ b/src/plugins/shellintegration/wl-shell/CMakeLists.txt
@@ -10,7 +10,7 @@ qt_internal_add_module(WlShellIntegrationPrivate
     SOURCES
         qwaylandwlshellintegration.cpp qwaylandwlshellintegration_p.h
         qwaylandwlshellsurface.cpp qwaylandwlshellsurface_p.h
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::GuiPrivate
         Qt::WaylandClientPrivate
         Wayland::Client
@@ -42,7 +42,7 @@ qt_internal_add_plugin(QWaylandWlShellIntegrationPlugin
     TYPE wayland-shell-integration
     SOURCES
         main.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::GuiPrivate
         Qt::WaylandClientPrivate
         Qt::WlShellIntegrationPrivate
diff --git a/src/plugins/shellintegration/xdg-shell/CMakeLists.txt b/src/plugins/shellintegration/xdg-shell/CMakeLists.txt
index 88a78df7..81db88a9 100644
--- a/src/plugins/shellintegration/xdg-shell/CMakeLists.txt
+++ b/src/plugins/shellintegration/xdg-shell/CMakeLists.txt
@@ -12,7 +12,7 @@ qt_internal_add_plugin(QWaylandXdgShellIntegrationPlugin
         qwaylandxdgdecorationv1.cpp qwaylandxdgdecorationv1_p.h
         qwaylandxdgshell.cpp qwaylandxdgshell_p.h
         qwaylandxdgshellintegration.cpp qwaylandxdgshellintegration_p.h
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Core
         Qt::Gui
         Qt::GuiPrivate