From fb8e5fddca22a07bff582266108ab7cb00fb5ab6 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Wed, 13 Jul 2022 17:57:43 +0200 Subject: [PATCH] Add private header filters to the qt_interal_add_module calls This is required to filter the generated wayland files when syncing headers. Task-number: QTBUG-103196 Change-Id: I86d440bf8b56802dff2fa75ba621c37a8daa8bbf Reviewed-by: Alexandru Croitor Reviewed-by: Qt CI Bot --- src/plugins/platforms/wayland/CMakeLists.txt | 2 ++ .../wayland/plugins/shellintegration/wl-shell/CMakeLists.txt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/plugins/platforms/wayland/CMakeLists.txt b/src/plugins/platforms/wayland/CMakeLists.txt index d38befdbcf5..820c9eadad9 100644 --- a/src/plugins/platforms/wayland/CMakeLists.txt +++ b/src/plugins/platforms/wayland/CMakeLists.txt @@ -74,6 +74,8 @@ qt_internal_add_module(WaylandClient Qt::CorePrivate Qt::GuiPrivate Qt::WaylandGlobalPrivate + PRIVATE_HEADER_FILTERS + "^qwayland-.*\.h|^wayland-.*-protocol\.h" ) qt6_generate_wayland_protocol_client_sources(WaylandClient 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 5bb4144b512..142bd21aaaa 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/CMakeLists.txt +++ b/src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/CMakeLists.txt @@ -17,6 +17,8 @@ qt_internal_add_module(WlShellIntegrationPrivate Qt::GuiPrivate Qt::WaylandClientPrivate Wayland::Client + PRIVATE_HEADER_FILTERS + "^qwayland-.*\.h|^wayland-.*-protocol\.h" ) qt6_generate_wayland_protocol_client_sources(WlShellIntegrationPrivate