From d25f5edfab10e41e0bd3421367d77a3b4c77985b Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Wed, 13 Jul 2022 17:57:43 +0200 Subject: 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/client/CMakeLists.txt | 2 ++ src/compositor/CMakeLists.txt | 2 ++ src/imports/texture-sharing/CMakeLists.txt | 2 ++ src/plugins/shellintegration/wl-shell/CMakeLists.txt | 2 ++ 4 files changed, 8 insertions(+) diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index d38befdb..820c9ead 100644 --- a/src/client/CMakeLists.txt +++ b/src/client/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/compositor/CMakeLists.txt b/src/compositor/CMakeLists.txt index dc0f1542..593d6194 100644 --- a/src/compositor/CMakeLists.txt +++ b/src/compositor/CMakeLists.txt @@ -73,6 +73,8 @@ qt_internal_add_module(WaylandCompositor Qt::CorePrivate Qt::GuiPrivate Qt::WaylandGlobalPrivate + PRIVATE_HEADER_FILTERS + "^qwayland-.*\.h|^wayland-.*-protocol\.h" ) set(compositor_no_pch_sources diff --git a/src/imports/texture-sharing/CMakeLists.txt b/src/imports/texture-sharing/CMakeLists.txt index e9843171..5023dc41 100644 --- a/src/imports/texture-sharing/CMakeLists.txt +++ b/src/imports/texture-sharing/CMakeLists.txt @@ -30,6 +30,8 @@ qt_internal_add_qml_module(WaylandTextureSharing Qt::QuickPrivate Qt::WaylandClient Qt::WaylandClientPrivate + PRIVATE_HEADER_FILTERS + "^qwayland-.*\.h|^wayland-.*-protocol\.h" ) 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 5bb4144b..142bd21a 100644 --- a/src/plugins/shellintegration/wl-shell/CMakeLists.txt +++ b/src/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 -- cgit v1.2.1