Sync from SUSE:SLFO:1.1 qt6-wayland revision 94cc202f518737316538dedaffa33a25

0001-Client-Ensure-that-guessed-popup-parent-has-a-shell-.patch

@@ -0,0 +1,37 @@
+From 92bcb8f6b7a852c7a5d662fc34de561692a7a454 Mon Sep 17 00:00:00 2001
+From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
+Date: Thu, 20 Jun 2024 11:25:06 +0300
+Subject: [PATCH] Client: Ensure that guessed popup parent has a shell surface
+
+The last input window may not have a shell surface if it is a subsurface
+or that window has been just made invisible.
+
+Change-Id: Iad11c68659579429ddc5d9ba0038975b25da8e0d
+Reviewed-by: David Edmundson <davidedmundson@kde.org>
+(cherry picked from commit 52c406cec149634680489faeeaf06bb1258cd12f)
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+(cherry picked from commit 7d04c18531276c94bfdf2f9a955d6f02554b28b2)
+---
+ src/client/qwaylandwindow.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
+index 22aeba10..c3725ffc 100644
+--- a/src/client/qwaylandwindow.cpp
++++ b/src/client/qwaylandwindow.cpp
+@@ -1157,8 +1157,10 @@ QWaylandWindow *QWaylandWindow::guessTransientParent() const
+             return mTopPopup;
+     }
+ 
+-    if (window()->type() == Qt::ToolTip || window()->type() == Qt::Popup)
+-        return display()->lastInputWindow();
++    if (window()->type() == Qt::ToolTip || window()->type() == Qt::Popup) {
++        if (auto lastInputWindow = display()->lastInputWindow())
++            return closestShellSurfaceWindow(lastInputWindow->window());
++    }
+ 
+     return nullptr;
+ }
+-- 
+2.45.2
+

0001-client-Guard-against-windows-being-on-a-null-screen.patch

@@ -0,0 +1,44 @@
+From 8811c62a0c31443ee888a67df2e960bc040f3dcc Mon Sep 17 00:00:00 2001
+From: David Edmundson <davidedmundson@kde.org>
+Date: Wed, 10 Jul 2024 09:00:33 +0100
+Subject: [PATCH 1/2] client: Guard against windows being on a null screen
+
+calculateScreenFromSurfaceEvents uses the screen information from our
+surface enter events. If this is not set yet, or refers to outputs not
+yet complete we fall back to the QWindow::screen. This was introduced in
+e03613524fc9f6be5c4cd7e9bdb00bc09c7f1e0b.
+
+It was assumed that this would always be a valid value as QtBase keeps
+it updated, but there are apparently paths for it to still be null.
+
+It will be evaluated again when the surface receives a wl_enter event or
+the output that we have entered is finally initialised and we will then
+be marked as on the correct screen.
+
+Change-Id: I33b4a5112c3426a8ea523d39a0658ba7ffee5298
+Reviewed-by: Aleix Pol Gonzalez <aleixpol@kde.org>
+Reviewed-by: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
+(cherry picked from commit c4f91b479303dda2e49499de249018d7c66c5f99)
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+(cherry picked from commit ec07c90cd647fd7a647f3f10dcae4d18699263df)
+(cherry picked from commit 406995207eae8d644b6e5262aa716a48c7e471a8)
+---
+ src/client/qwaylandwindow.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
+index 22aeba10..c64f3326 100644
+--- a/src/client/qwaylandwindow.cpp
++++ b/src/client/qwaylandwindow.cpp
+@@ -1405,7 +1405,7 @@ void QWaylandWindow::handleScreensChanged()
+ {
+     QPlatformScreen *newScreen = calculateScreenFromSurfaceEvents();
+ 
+-    if (newScreen->screen() == window()->screen())
++    if (!newScreen || newScreen->screen() == window()->screen())
+         return;
+ 
+     QWindowSystemInterface::handleWindowScreenChanged(window(), newScreen->QPlatformScreen::screen());
+-- 
+2.45.2
+

0002-Client-Improve-thread-safety-determining-window-size.patch

@@ -0,0 +1,86 @@
+From be646fd42892d6e59a573a0a188c5ae193d2be83 Mon Sep 17 00:00:00 2001
+From: David Edmundson <davidedmundson@kde.org>
+Date: Fri, 5 Jul 2024 16:13:40 +0100
+Subject: [PATCH 2/2] Client: Improve thread safety determining window size on
+ the render thread
+
+updateSurface is called from both the render and GUI thread. We
+therefore need every property referenced to be thread safe.
+
+Rather than guarding each property we cache the buffer size whenever the
+window geometry or scale changes and put a mutex round this one
+variable.
+
+Change-Id: I4168ced27556e0e4558bbdbd1daa275d7523c33d
+Reviewed-by: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
+(cherry picked from commit 83da29c62f8fb918df8d91826d16b5d5ceb2c704)
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+(cherry picked from commit f817608c7152487f489d0f3a227c1d0ceb7b0c2c)
+---
+ .../client/wayland-egl/qwaylandeglwindow.cpp  | 20 +++++++++++++++----
+ .../client/wayland-egl/qwaylandeglwindow_p.h  |  6 ++++++
+ 2 files changed, 22 insertions(+), 4 deletions(-)
+
+diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
+index e6258893..d020f4db 100644
+--- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
++++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
+@@ -50,6 +50,15 @@ QWaylandWindow::WindowType QWaylandEglWindow::windowType() const
+ 
+ void QWaylandEglWindow::ensureSize()
+ {
++    // this is always called on the main thread
++    QMargins margins = mWindowDecoration ? frameMargins() : QMargins{};
++    QRect rect = geometry();
++    QSize sizeWithMargins = (rect.size() + QSize(margins.left() + margins.right(), margins.top() + margins.bottom())) * scale();
++    {
++        QWriteLocker lock(&m_bufferSizeLock);
++        m_bufferSize = sizeWithMargins;
++    }
++
+     updateSurface(false);
+ }
+ 
+@@ -60,14 +69,17 @@ void QWaylandEglWindow::setGeometry(const QRect &rect)
+     // we're now getting a resize we don't want to create it again.
+     // Just resize the wl_egl_window, the EGLSurface will be created
+     // the next time makeCurrent is called.
+-    updateSurface(false);
++    ensureSize();
+ }
+ 
+ void QWaylandEglWindow::updateSurface(bool create)
+ {
+-    QMargins margins = mWindowDecoration ? frameMargins() : QMargins{};
+-    QRect rect = geometry();
+-    QSize sizeWithMargins = (rect.size() + QSize(margins.left() + margins.right(), margins.top() + margins.bottom())) * scale();
++
++    QSize sizeWithMargins;
++    {
++        QReadLocker lock(&m_bufferSizeLock);
++        sizeWithMargins = m_bufferSize;
++    }
+ 
+     // wl_egl_windows must have both width and height > 0
+     // mesa's egl returns NULL if we try to create a, invalid wl_egl_window, however not all EGL
+diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow_p.h b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow_p.h
+index 5b9aa987..048f0b61 100644
+--- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow_p.h
++++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow_p.h
+@@ -60,7 +60,13 @@ private:
+     mutable QOpenGLFramebufferObject *m_contentFBO = nullptr;
+ 
+     QSurfaceFormat m_format;
++    // Size used in the last call to wl_egl_window_resize
+     QSize m_requestedSize;
++
++    // Size of the buffer used by QWaylandWindow
++    // This is always written to from the main thread, potentially read from the rendering thread
++    QReadWriteLock m_bufferSizeLock;
++    QSize m_bufferSize;
+ };
+ 
+ }
+-- 
+2.45.2
+

qt6-wayland.changes

@@ -1,89 +1,3 @@
--------------------------------------------------------------------
-Tue Jun  3 07:49:34 UTC 2025 - Christophe Marin <christophe@krop.fr>
-
-- Update to 6.9.1:
-  * https://www.qt.io/blog/qt-6.9.1-released
-- Drop patch, merged upstream:
-  * 0001-Client-Reset-mFrameCallbackTimedOut-when-showing-a-w.patch
-
--------------------------------------------------------------------
-Thu Apr 17 07:31:29 UTC 2025 - Christophe Marin <christophe@krop.fr>
-
-- Add upstream change:
-  * 0001-Client-Reset-mFrameCallbackTimedOut-when-showing-a-w.patch
-
--------------------------------------------------------------------
-Wed Apr  2 11:03:44 UTC 2025 - Christophe Marin <christophe@krop.fr>
-
-- Update to 6.9.0:
-  * https://www.qt.io/blog/qt-6.9-released
-- Drop patches, merged upstream:
-  * 0001-update-wayland_xml-to-version-1_23_0.patch
-  * fix-taskbar.patch
-
--------------------------------------------------------------------
-Sun Mar  9 22:50:26 UTC 2025 - Christophe Marin <christophe@krop.fr>
-
-- Ignore private QML imports
-
--------------------------------------------------------------------
-Fri Feb 28 17:12:04 UTC 2025 - pallas wept <pallaswept@proton.me>
-
-- Add patch to fix failures when drag'n'drop in the task manager
-  * fix-taskbar.patch
-
-
--------------------------------------------------------------------
-Fri Jan 31 10:23:02 UTC 2025 - Christophe Marin <christophe@krop.fr>
-
-- Update to 6.8.2
-  https://www.qt.io/blog/qt-6.8.2-released
-- Drop patches, merged upstream:
-  * 0001-fix-crash-issue.patch
-  * 0001-client-Redo-management-of-tablet-object-proxies.patch
-
--------------------------------------------------------------------
-Mon Dec  2 13:02:16 UTC 2024 - Christophe Marin <christophe@krop.fr>
-
-- Update to 6.8.1:
-  * https://www.qt.io/blog/qt-6.8.1-released
-
--------------------------------------------------------------------
-Thu Nov 28 16:18:57 UTC 2024 - Christophe Marin <christophe@krop.fr>
-
-- Add patch to fix crash when unplugging a graphics tablet:
-  * 0001-client-Redo-management-of-tablet-object-proxies.patch
-
--------------------------------------------------------------------
-Fri Nov  8 14:10:37 UTC 2024 - Hillwood Yang <hillwood@opensuse.org>
-
-- Add 0001-fix-crash-issue.patch
-  fix crash when attach differ shellsurface to the same shellsurfaceitem (boo#1233141)
-
--------------------------------------------------------------------
-Tue Oct  8 09:29:56 UTC 2024 - Christophe Marin <christophe@krop.fr>
-
-- Update to 6.8.0:
-  * https://www.qt.io/blog/qt-6.8-released
-- Rebase 0001-update-wayland_xml-to-version-1_23_0.patch
-
--------------------------------------------------------------------
-Sat Sep 28 08:23:11 UTC 2024 - Christophe Marin <christophe@krop.fr>
-
-- Update to 6.7.3
-  * https://www.qt.io/blog/qt-6.7.3-released
-- Drop patches, merged upstream:
-  * 0001-Client-Ensure-that-guessed-popup-parent-has-a-shell-.patch
-  * 0001-client-Guard-against-windows-being-on-a-null-screen.patch
-  * 0002-Client-Improve-thread-safety-determining-window-size.patch
-
--------------------------------------------------------------------
-Wed Aug 28 08:36:28 UTC 2024 - Hillwood Yang <hillwood@opensuse.org>
-
-- Add patch to fix 'wl_shm' higher than interface version (2 > 1)
-  (boo#1229893, QTBUG-126379):
-  * 0001-update-wayland_xml-to-version-1_23_0.patch
-  
 -------------------------------------------------------------------
 Tue Jul 16 09:02:13 UTC 2024 - Fabian Vogt <fvogt@suse.com>
 

qt6-wayland.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package qt6-wayland
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,8 @@
 #
 
 
-%define real_version 6.9.1
+%define real_version 6.7.2
-%define short_version 6.9
+%define short_version 6.7
 %define tar_name qtwayland-everywhere-src
 %define tar_suffix %{nil}
 #
@@ -26,14 +26,11 @@
 %define pkg_suffix -docs
 %endif
 #
-# Private QML imports
-%global __requires_exclude qt6qmlimport\\(io\\.qt\\.examples.*
-#
 %ifnarch %{arm} aarch64
 %global with_opengl 1
 %endif
 Name:           qt6-wayland%{?pkg_suffix}
-Version:        6.9.1
+Version:        6.7.2
 Release:        0
 Summary:        Qt 6 Wayland libraries and tools
 # The wayland compositor files are GPL-3.0-or-later
@@ -41,19 +38,23 @@ License:        GPL-3.0-or-later AND (GPL-2.0-only OR LGPL-3.0-only OR GPL-3.0-o
 URL:            https://www.qt.io
 Source0:        https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz
 Source99:       qt6-wayland-rpmlintrc
+# PATCH-FIX-UPSTREAM
+Patch1:         0001-Client-Ensure-that-guessed-popup-parent-has-a-shell-.patch
+Patch2:         0001-client-Guard-against-windows-being-on-a-null-screen.patch
+# https://codereview.qt-project.org/c/qt/qtwayland/+/574983
+Patch3:         0002-Client-Improve-thread-safety-determining-window-size.patch
 BuildRequires:  pkgconfig
+BuildRequires:  qt6-core-private-devel
+BuildRequires:  qt6-gui-private-devel
+BuildRequires:  qt6-opengl-private-devel
 BuildRequires:  qt6-platformsupport-private-devel
+BuildRequires:  qt6-qml-private-devel
+BuildRequires:  qt6-quick-private-devel
 BuildRequires:  cmake(Qt6Core) = %{real_version}
-BuildRequires:  cmake(Qt6CorePrivate) = %{real_version}
 BuildRequires:  cmake(Qt6Gui) = %{real_version}
-BuildRequires:  cmake(Qt6GuiPrivate) = %{real_version}
 BuildRequires:  cmake(Qt6OpenGL) = %{real_version}
-BuildRequires:  cmake(Qt6OpenGLPrivate) = %{real_version}
 BuildRequires:  cmake(Qt6Qml) = %{real_version}
-BuildRequires:  cmake(Qt6QmlPrivate) = %{real_version}
 BuildRequires:  cmake(Qt6Quick) = %{real_version}
-BuildRequires:  cmake(Qt6QuickPrivate) = %{real_version}
-BuildRequires:  cmake(Qt6Svg) = %{real_version}
 BuildRequires:  pkgconfig(egl)
 BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-cursor)
@@ -85,8 +86,8 @@ This meta-package requires all the qt6-wayland development packages.
 
 %package private-devel
 Summary:        Qt6 wayland unstable ABI meta package
-Requires:       cmake(Qt6WaylandClientPrivate) = %{real_version}
+Requires:       qt6-waylandclient-private-devel = %{version}
-Requires:       cmake(Qt6WaylandCompositorPrivate) = %{real_version}
+Requires:       qt6-waylandcompositor-private-devel = %{version}
 Requires:       cmake(Qt6WaylandEglClientHwIntegrationPrivate) = %{real_version}
 Requires:       cmake(Qt6WaylandEglCompositorHwIntegrationPrivate) = %{real_version}
 Requires:       cmake(Qt6WlShellIntegrationPrivate) = %{real_version}
@@ -122,9 +123,9 @@ Development files for the Qt6 WaylandClient library.
 
 %package -n qt6-waylandclient-private-devel
 Summary:        Non-ABI stable API for the Qt 6 WaylandClient library
-Requires:       cmake(Qt6CorePrivate) = %{real_version}
-Requires:       cmake(Qt6GuiPrivate) = %{real_version}
 Requires:       cmake(Qt6WaylandClient) = %{real_version}
+%requires_eq    qt6-core-private-devel
+%requires_eq    qt6-gui-private-devel
 
 %description -n qt6-waylandclient-private-devel
 This package provides private headers of libQt6WaylandClient that do not have
@@ -150,11 +151,11 @@ Development files for the Qt6 WaylandCompositor library.
 
 %package -n qt6-waylandcompositor-private-devel
 Summary:        Non-ABI stable API for the Qt6 WaylandCompositor library
-Requires:       cmake(Qt6CorePrivate) = %{real_version}
-Requires:       cmake(Qt6GuiPrivate) = %{real_version}
-Requires:       cmake(Qt6QmlPrivate) = %{real_version}
-Requires:       cmake(Qt6QuickPrivate) = %{real_version}
 Requires:       cmake(Qt6WaylandCompositor) = %{real_version}
+%requires_eq    qt6-core-private-devel
+%requires_eq    qt6-gui-private-devel
+%requires_eq    qt6-qml-private-devel
+%requires_eq    qt6-quick-private-devel
 
 %description -n qt6-waylandcompositor-private-devel
 This package provides private headers of libQt6WaylandCompositor that do not
@@ -179,9 +180,9 @@ This library does not have any ABI or API guarantees.
 %package -n qt6-waylandeglclienthwintegration-private-devel
 Summary:        Qt 6 WaylandEglClientHwIntegration library - Development files
 Requires:       libQt6WaylandEglClientHwIntegration6 = %{version}
+Requires:       qt6-waylandclient-private-devel = %{version}
 Requires:       cmake(Qt6Gui) = %{real_version}
-Requires:       cmake(Qt6OpenGLPrivate) = %{real_version}
+%requires_eq    qt6-opengl-private-devel
-Requires:       cmake(Qt6WaylandClientPrivate) = %{real_version}
 
 %description -n qt6-waylandeglclienthwintegration-private-devel
 Development files for the Qt 6 WaylandEglClientHwIntegration library.
@@ -197,8 +198,8 @@ This library does not have any ABI or API guarantees.
 %package -n qt6-waylandeglcompositorhwintegration-private-devel
 Summary:        Qt 6 WaylandEglCompositorHwIntegration library - Development files
 Requires:       libQt6WaylandEglCompositorHwIntegration6 = %{version}
+Requires:       qt6-waylandcompositor-private-devel = %{version}
 Requires:       cmake(Qt6Gui) = %{real_version}
-Requires:       cmake(Qt6WaylandCompositorPrivate) = %{real_version}
 
 %description -n qt6-waylandeglcompositorhwintegration-private-devel
 Development files for the Qt 6 WaylandEglCompositorHwIntegration library.
@@ -234,8 +235,7 @@ This is a meta package, it does not contain any file
 EOF
 
 %build
-%cmake_qt6 \
+%cmake_qt6
-  -DQT_GENERATE_SBOM:BOOL=FALSE
 
 %{qt6_build}
 
@@ -293,66 +293,24 @@ rm %{buildroot}%{_qt6_cmakedir}/*/*Plugin{Config,Targets}*.cmake
 %exclude %{_qt6_includedir}/QtWaylandClient/%{real_version}
 
 %files -n qt6-waylandclient-private-devel
-%{_qt6_cmakedir}/Qt6WaylandClientPrivate/
 %{_qt6_includedir}/QtWaylandClient/%{real_version}/
 %{_qt6_mkspecsdir}/modules/qt_lib_waylandclient_private.pri
 
 %files -n libQt6WaylandCompositor6
 %{_qt6_libdir}/libQt6WaylandCompositor.so.*
-%{_qt6_libdir}/libQt6WaylandCompositorIviapplication.so.*
-%{_qt6_libdir}/libQt6WaylandCompositorPresentationTime.so.*
-%{_qt6_libdir}/libQt6WaylandCompositorWLShell.so.*
-%{_qt6_libdir}/libQt6WaylandCompositorXdgShell.so.*
 
 %files -n qt6-waylandcompositor-devel
 %{_qt6_cmakedir}/Qt6WaylandCompositor/
-%{_qt6_cmakedir}/Qt6WaylandCompositorIviapplication/
-%{_qt6_cmakedir}/Qt6WaylandCompositorPresentationTime/
-%{_qt6_cmakedir}/Qt6WaylandCompositorWLShell/
-%{_qt6_cmakedir}/Qt6WaylandCompositorXdgShell/
 %{_qt6_descriptionsdir}/WaylandCompositor.json
-%{_qt6_descriptionsdir}/WaylandCompositorIviapplication.json
-%{_qt6_descriptionsdir}/WaylandCompositorPresentationTime.json
-%{_qt6_descriptionsdir}/WaylandCompositorWLShell.json
-%{_qt6_descriptionsdir}/WaylandCompositorXdgShell.json
 %{_qt6_includedir}/QtWaylandCompositor/
-%{_qt6_includedir}/QtWaylandCompositorIviapplication/
-%{_qt6_includedir}/QtWaylandCompositorPresentationTime/
-%{_qt6_includedir}/QtWaylandCompositorWLShell/
-%{_qt6_includedir}/QtWaylandCompositorXdgShell/
 %{_qt6_libdir}/libQt6WaylandCompositor.prl
 %{_qt6_libdir}/libQt6WaylandCompositor.so
-%{_qt6_libdir}/libQt6WaylandCompositorIviapplication.prl
-%{_qt6_libdir}/libQt6WaylandCompositorIviapplication.so
-%{_qt6_libdir}/libQt6WaylandCompositorPresentationTime.prl
-%{_qt6_libdir}/libQt6WaylandCompositorPresentationTime.so
-%{_qt6_libdir}/libQt6WaylandCompositorWLShell.prl
-%{_qt6_libdir}/libQt6WaylandCompositorWLShell.so
-%{_qt6_libdir}/libQt6WaylandCompositorXdgShell.prl
-%{_qt6_libdir}/libQt6WaylandCompositorXdgShell.so
 %{_qt6_metatypesdir}/qt6waylandcompositor_*_metatypes.json
-%{_qt6_metatypesdir}/qt6waylandcompositoriviapplication_*_metatypes.json
-%{_qt6_metatypesdir}/qt6waylandcompositorpresentationtime_*_metatypes.json
-%{_qt6_metatypesdir}/qt6waylandcompositorwlshell_*_metatypes.json
-%{_qt6_metatypesdir}/qt6waylandcompositorxdgshell_*_metatypes.json
 %{_qt6_mkspecsdir}/modules/qt_lib_waylandcompositor.pri
-%{_qt6_mkspecsdir}/modules/qt_lib_waylandcompositoriviapplication*.pri
-%{_qt6_mkspecsdir}/modules/qt_lib_waylandcompositorpresentationtime*.pri
-%{_qt6_mkspecsdir}/modules/qt_lib_waylandcompositorwlshell*.pri
-%{_qt6_mkspecsdir}/modules/qt_lib_waylandcompositorxdgshell*.pri
 %{_qt6_pkgconfigdir}/Qt6WaylandCompositor.pc
-%{_qt6_pkgconfigdir}/Qt6WaylandCompositorIviapplication.pc
-%{_qt6_pkgconfigdir}/Qt6WaylandCompositorPresentationTime.pc
-%{_qt6_pkgconfigdir}/Qt6WaylandCompositorWLShell.pc
-%{_qt6_pkgconfigdir}/Qt6WaylandCompositorXdgShell.pc
 %exclude %{_qt6_includedir}/QtWaylandCompositor/%{real_version}
 
 %files -n qt6-waylandcompositor-private-devel
-%{_qt6_cmakedir}/Qt6WaylandCompositorPrivate/
-%{_qt6_cmakedir}/Qt6WaylandCompositorIviapplicationPrivate/
-%{_qt6_cmakedir}/Qt6WaylandCompositorPresentationTimePrivate/
-%{_qt6_cmakedir}/Qt6WaylandCompositorWLShellPrivate/
-%{_qt6_cmakedir}/Qt6WaylandCompositorXdgShellPrivate/
 %{_qt6_includedir}/QtWaylandCompositor/%{real_version}/
 %{_qt6_mkspecsdir}/modules/qt_lib_waylandcompositor_private.pri