From d5252fff7437d4cfc3edcaaabff9bb4f3d6f52bd Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Wed, 29 Nov 2023 13:42:17 +0100 Subject: [PATCH] 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 Reviewed-by: Qt CI Bot --- src/platformsupport/wayland/CMakeLists.txt | 6 +++++- .../plugins/shellintegration/wl-shell/CMakeLists.txt | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/platformsupport/wayland/CMakeLists.txt b/src/platformsupport/wayland/CMakeLists.txt index b2804ea2ef2..a38d9551202 100644 --- a/src/platformsupport/wayland/CMakeLists.txt +++ b/src/platformsupport/wayland/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/plugins/platforms/wayland/plugins/shellintegration/wl-shell/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/CMakeLists.txt index 142bd21aaaa..09b076d00c3 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/CMakeLists.txt +++ b/src/plugins/platforms/wayland/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