Use NO_GENERATE_CPP_EXPORTS explicitly

Use NO_GENERATE_CPP_EXPORTS explicitly for modules that don't need
the autogenerated exports header file.

Task-number: QTBUG-90492
Change-Id: I3494ac88e136126265e14ef1a380c5ef26def3ef
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

12 files changed, 16 insertions, 1 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b2804ea2e..a38d95512 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -29,7 +29,11 @@ configure the module on targets that are missing dependencies.")
 endif()
 
 # See global/README for a description of the following module.
-qt_internal_add_module(WaylandGlobalPrivate INTERNAL_MODULE HEADER_MODULE)
+qt_internal_add_module(WaylandGlobalPrivate
+    INTERNAL_MODULE
+    HEADER_MODULE
+    NO_GENERATE_CPP_EXPORTS
+)
 
 # Work around 115101.
 # If nothing depends on the WaylandGlobalPrivate target it doesn't run custom commands that the
diff --git a/src/compositor/CMakeLists.txt b/src/compositor/CMakeLists.txt
index 525644381..861aeef74 100644
--- a/src/compositor/CMakeLists.txt
+++ b/src/compositor/CMakeLists.txt
@@ -222,6 +222,7 @@ if (TARGET Qt::Qml)
             qmlfiles/WaylandOutputWindow.qml
         DEPENDENCIES
             QtQuick
+        NO_GENERATE_CPP_EXPORTS
     )
 endif()
 
diff --git a/src/hardwareintegration/client/wayland-egl/CMakeLists.txt b/src/hardwareintegration/client/wayland-egl/CMakeLists.txt
index 601af81d9..967dd3cab 100644
--- a/src/hardwareintegration/client/wayland-egl/CMakeLists.txt
+++ b/src/hardwareintegration/client/wayland-egl/CMakeLists.txt
@@ -27,6 +27,7 @@ qt_internal_add_module(WaylandEglClientHwIntegrationPrivate
         Qt::WaylandClientPrivate
         Wayland::Client
         Wayland::Egl
+    NO_GENERATE_CPP_EXPORTS
 )
 
 #### Keys ignored in scope 1:.:.:wayland-egl.pro:<TRUE>:
diff --git a/src/hardwareintegration/compositor/wayland-egl/CMakeLists.txt b/src/hardwareintegration/compositor/wayland-egl/CMakeLists.txt
index b72645da5..f31928550 100644
--- a/src/hardwareintegration/compositor/wayland-egl/CMakeLists.txt
+++ b/src/hardwareintegration/compositor/wayland-egl/CMakeLists.txt
@@ -21,6 +21,7 @@ qt_internal_add_module(WaylandEglCompositorHwIntegrationPrivate
         Qt::Core
         Qt::Gui
         Qt::WaylandCompositorPrivate
+    NO_GENERATE_CPP_EXPORTS
 )
 
 qt_internal_extend_target(WaylandEglCompositorHwIntegrationPrivate CONDITION NOT QT_FEATURE_egl_x11
diff --git a/src/imports/compositor-extensions/iviapplication/CMakeLists.txt b/src/imports/compositor-extensions/iviapplication/CMakeLists.txt
index 370b8d8b0..eaf0f8770 100644
--- a/src/imports/compositor-extensions/iviapplication/CMakeLists.txt
+++ b/src/imports/compositor-extensions/iviapplication/CMakeLists.txt
@@ -22,6 +22,7 @@ qt_internal_add_qml_module(WaylandCompositorIviapplication
         Qt::Core
         Qt::Gui
         Qt::WaylandCompositor
+    NO_GENERATE_CPP_EXPORTS
 )
 
 qt_internal_add_autogen_sync_header_dependencies(WaylandCompositorIviapplication WaylandCompositor)
diff --git a/src/imports/compositor-extensions/presentationtime/CMakeLists.txt b/src/imports/compositor-extensions/presentationtime/CMakeLists.txt
index 1ae709841..f1413dfc1 100644
--- a/src/imports/compositor-extensions/presentationtime/CMakeLists.txt
+++ b/src/imports/compositor-extensions/presentationtime/CMakeLists.txt
@@ -19,6 +19,7 @@ qt_internal_add_qml_module(WaylandCompositorPresentationTime
         Qt::Core
         Qt::Gui
         Qt::WaylandCompositorPrivate
+    NO_GENERATE_CPP_EXPORTS
 )
 
 qt_internal_add_autogen_sync_header_dependencies(WaylandCompositorPresentationTime
diff --git a/src/imports/compositor-extensions/qtshell/CMakeLists.txt b/src/imports/compositor-extensions/qtshell/CMakeLists.txt
index 9b1372a4b..7bb165bf3 100644
--- a/src/imports/compositor-extensions/qtshell/CMakeLists.txt
+++ b/src/imports/compositor-extensions/qtshell/CMakeLists.txt
@@ -27,6 +27,7 @@ qt_internal_add_qml_module(WaylandCompositorQtShell
         Qt::QuickPrivate
         Qt::WaylandCompositor
         Qt::WaylandCompositorPrivate
+    NO_GENERATE_CPP_EXPORTS
 )
 
 qt6_generate_wayland_protocol_server_sources(WaylandCompositorQtShell
diff --git a/src/imports/compositor-extensions/wlshell/CMakeLists.txt b/src/imports/compositor-extensions/wlshell/CMakeLists.txt
index 62741710a..0dd155e35 100644
--- a/src/imports/compositor-extensions/wlshell/CMakeLists.txt
+++ b/src/imports/compositor-extensions/wlshell/CMakeLists.txt
@@ -22,6 +22,7 @@ qt_internal_add_qml_module(WaylandCompositorWLShell
         Qt::Core
         Qt::Gui
         Qt::WaylandCompositor
+    NO_GENERATE_CPP_EXPORTS
 )
 
 qt_internal_add_autogen_sync_header_dependencies(WaylandCompositorWLShell WaylandCompositor)
diff --git a/src/imports/compositor-extensions/xdgshell/CMakeLists.txt b/src/imports/compositor-extensions/xdgshell/CMakeLists.txt
index 99b010118..d5bfd9dd8 100644
--- a/src/imports/compositor-extensions/xdgshell/CMakeLists.txt
+++ b/src/imports/compositor-extensions/xdgshell/CMakeLists.txt
@@ -22,6 +22,7 @@ qt_internal_add_qml_module(WaylandCompositorXdgShell
         Qt::Core
         Qt::Gui
         Qt::WaylandCompositor
+    NO_GENERATE_CPP_EXPORTS
 )
 
 qt_internal_add_autogen_sync_header_dependencies(WaylandCompositorXdgShell WaylandCompositor)
diff --git a/src/imports/texture-sharing-extension/CMakeLists.txt b/src/imports/texture-sharing-extension/CMakeLists.txt
index 7d4833812..564bb6402 100644
--- a/src/imports/texture-sharing-extension/CMakeLists.txt
+++ b/src/imports/texture-sharing-extension/CMakeLists.txt
@@ -27,6 +27,7 @@ qt_internal_add_qml_module(WaylandTextureSharingExtension
         Qt::QuickPrivate
         Qt::WaylandCompositor
         Qt::WaylandCompositorPrivate
+    NO_GENERATE_CPP_EXPORTS
 )
 
 qt_internal_add_autogen_sync_header_dependencies(WaylandTextureSharingExtension WaylandCompositor)
diff --git a/src/imports/texture-sharing/CMakeLists.txt b/src/imports/texture-sharing/CMakeLists.txt
index f8bdb7f28..61d6690e6 100644
--- a/src/imports/texture-sharing/CMakeLists.txt
+++ b/src/imports/texture-sharing/CMakeLists.txt
@@ -32,6 +32,7 @@ qt_internal_add_qml_module(WaylandTextureSharing
         Qt::WaylandClientPrivate
     PRIVATE_HEADER_FILTERS
         "^qwayland-.*\.h|^wayland-.*-protocol\.h"
+    NO_GENERATE_CPP_EXPORTS
 )
 
 qt6_generate_wayland_protocol_client_sources(WaylandTextureSharing
diff --git a/src/plugins/shellintegration/wl-shell/CMakeLists.txt b/src/plugins/shellintegration/wl-shell/CMakeLists.txt
index 142bd21aa..09b076d00 100644
--- a/src/plugins/shellintegration/wl-shell/CMakeLists.txt
+++ b/src/plugins/shellintegration/wl-shell/CMakeLists.txt
@@ -19,6 +19,7 @@ qt_internal_add_module(WlShellIntegrationPrivate
         Wayland::Client
     PRIVATE_HEADER_FILTERS
         "^qwayland-.*\.h|^wayland-.*-protocol\.h"
+    NO_GENERATE_CPP_EXPORTS
 )
 
 qt6_generate_wayland_protocol_client_sources(WlShellIntegrationPrivate