Compositor: Deprecate XdgShell unstable v6

A stable version of XdgShell has been released. Since most clients now support
stable and v6 is almost a copy of stable. Most people that use v6 can probably
just switch over to stable with minimal issues.

[ChangeLog][Compositor] XdgShellV6 has been deprecated, use XdgShell instead.

Task-number: QTBUG-81853
Change-Id: I1f5affe7ab0f6a1a0fe19f3a01ee146fb3bfeecf
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>

6 files changed, 30 insertions, 0 deletions

diff --git a/src/compositor/extensions/qwaylandxdgshellv6.cpp b/src/compositor/extensions/qwaylandxdgshellv6.cpp
index 94c430aad..6a2431594 100644
--- a/src/compositor/extensions/qwaylandxdgshellv6.cpp
+++ b/src/compositor/extensions/qwaylandxdgshellv6.cpp
@@ -54,6 +54,8 @@
 
 QT_BEGIN_NAMESPACE
 
+#if QT_DEPRECATED_SINCE(5, 15)
+
 QWaylandXdgShellV6Private::QWaylandXdgShellV6Private()
 {
 }
@@ -148,6 +150,7 @@ void QWaylandXdgShellV6Private::zxdg_shell_v6_pong(Resource *resource, uint32_t
  * \qmltype XdgShellV6
  * \inqmlmodule QtWayland.Compositor
  * \since 5.10
+ * \obsolete
  * \brief Provides an extension for desktop-style user interfaces.
  *
  * The XdgShellV6 extension provides a way to associate a XdgToplevelV6 or XdgPopupV6
@@ -175,6 +178,7 @@ void QWaylandXdgShellV6Private::zxdg_shell_v6_pong(Resource *resource, uint32_t
  * \class QWaylandXdgShellV6
  * \inmodule QtWaylandCompositor
  * \since 5.10
+ * \obsolete
  * \brief The QWaylandXdgShellV6 class is an extension for desktop-style user interfaces.
  *
  * The QWaylandXdgShellV6 extension provides a way to associate a QWaylandXdgToplevelV6 or
@@ -468,6 +472,7 @@ void QWaylandXdgSurfaceV6Private::zxdg_surface_v6_set_window_geometry(QtWaylandS
  * \qmltype XdgSurfaceV6
  * \inqmlmodule QtWayland.Compositor
  * \since 5.10
+ * \obsolete
  * \brief XdgSurfaceV6 provides desktop-style compositor-specific features to an xdg surface.
  *
  * This type is part of the \l{XdgShellV6} extension and provides a way to
@@ -482,6 +487,7 @@ void QWaylandXdgSurfaceV6Private::zxdg_surface_v6_set_window_geometry(QtWaylandS
  * \class QWaylandXdgSurfaceV6
  * \inmodule QtWaylandCompositor
  * \since 5.10
+ * \obsolete
  * \brief The QWaylandXdgSurfaceV6 class provides desktop-style compositor-specific features to an xdg surface.
  *
  * This class is part of the QWaylandXdgShellV6 extension and provides a way to
@@ -717,6 +723,7 @@ QWaylandQuickShellIntegration *QWaylandXdgSurfaceV6::createIntegration(QWaylandQ
  * \qmltype XdgToplevelV6
  * \inqmlmodule QtWayland.Compositor
  * \since 5.10
+ * \obsolete
  * \brief XdgToplevelV6 represents the toplevel window specific parts of an xdg surface.
  *
  * This type is part of the \l{XdgShellV6} extension and provides a way to
@@ -730,6 +737,7 @@ QWaylandQuickShellIntegration *QWaylandXdgSurfaceV6::createIntegration(QWaylandQ
  * \class QWaylandXdgToplevelV6
  * \inmodule QtWaylandCompositor
  * \since 5.10
+ * \obsolete
  * \brief The QWaylandXdgToplevelV6 class represents the toplevel window specific parts of an xdg surface.
  *
  * This class is part of the QWaylandXdgShellV6 extension and provides a way to
@@ -1480,6 +1488,7 @@ void QWaylandXdgToplevelV6Private::zxdg_toplevel_v6_set_minimized(QtWaylandServe
  * \qmltype XdgPopupV6
  * \inqmlmodule QtWayland.Compositor
  * \since 5.10
+ * \obsolete
  * \brief XdgPopupV6 represents the popup specific parts of and xdg surface.
  *
  * This type is part of the \l{XdgShellV6} extension and provides a way to extend
@@ -1493,6 +1502,7 @@ void QWaylandXdgToplevelV6Private::zxdg_toplevel_v6_set_minimized(QtWaylandServe
  * \class QWaylandXdgPopupV6
  * \inmodule QtWaylandCompositor
  * \since 5.10
+ * \obsolete
  * \brief The QWaylandXdgPopupV6 class represents the popup specific parts of an xdg surface.
  *
  * This class is part of the QWaylandXdgShellV6 extension and provides a way to
@@ -2030,4 +2040,6 @@ QWaylandXdgPositionerV6 *QWaylandXdgPositionerV6::fromResource(wl_resource *reso
     return QtWayland::fromResource<QWaylandXdgPositionerV6 *>(resource);
 }
 
+#endif // QT_DEPRECATED_SINCE(5, 15)
+
 QT_END_NAMESPACE
diff --git a/src/compositor/extensions/qwaylandxdgshellv6.h b/src/compositor/extensions/qwaylandxdgshellv6.h
index f280880bc..4231fa7f1 100644
--- a/src/compositor/extensions/qwaylandxdgshellv6.h
+++ b/src/compositor/extensions/qwaylandxdgshellv6.h
@@ -49,6 +49,8 @@ struct wl_resource;
 
 QT_BEGIN_NAMESPACE
 
+#if QT_DEPRECATED_SINCE(5, 15)
+
 class QWaylandClient;
 class QWaylandOutput;
 class QWaylandSeat;
@@ -259,6 +261,8 @@ private:
     friend class QWaylandXdgSurfaceV6Private;
 };
 
+#endif // QT_DEPRECATED_SINCE(5, 15)
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDXDGSHELLV6_H
diff --git a/src/compositor/extensions/qwaylandxdgshellv6_p.h b/src/compositor/extensions/qwaylandxdgshellv6_p.h
index f13e73da4..902224155 100644
--- a/src/compositor/extensions/qwaylandxdgshellv6_p.h
+++ b/src/compositor/extensions/qwaylandxdgshellv6_p.h
@@ -58,6 +58,8 @@
 
 QT_BEGIN_NAMESPACE
 
+#if QT_DEPRECATED_SINCE(5, 15)
+
 struct Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgPositionerV6Data {
     QSize size;
     QRect anchorRect;
@@ -241,6 +243,8 @@ public:
     QWaylandXdgPositionerV6Data m_data;
 };
 
+#endif // QT_DEPRECATED_SINCE(5, 15)
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDXDGSHELLV6_P_H
diff --git a/src/compositor/extensions/qwaylandxdgshellv6integration.cpp b/src/compositor/extensions/qwaylandxdgshellv6integration.cpp
index e424af193..98b748986 100644
--- a/src/compositor/extensions/qwaylandxdgshellv6integration.cpp
+++ b/src/compositor/extensions/qwaylandxdgshellv6integration.cpp
@@ -42,6 +42,8 @@
 
 QT_BEGIN_NAMESPACE
 
+#if QT_DEPRECATED_SINCE(5, 15)
+
 namespace QtWayland {
 
 static void handlePopupCreated(QWaylandQuickShellSurfaceItem *parentItem, QWaylandXdgPopupV6 *popup)
@@ -309,4 +311,6 @@ void XdgPopupV6Integration::handleGeometryChanged()
 
 }
 
+#endif // QT_DEPRECATED_SINCE(5, 15)
+
 QT_END_NAMESPACE
diff --git a/src/compositor/extensions/qwaylandxdgshellv6integration_p.h b/src/compositor/extensions/qwaylandxdgshellv6integration_p.h
index 9df2885f1..9513362f4 100644
--- a/src/compositor/extensions/qwaylandxdgshellv6integration_p.h
+++ b/src/compositor/extensions/qwaylandxdgshellv6integration_p.h
@@ -43,6 +43,8 @@
 
 QT_BEGIN_NAMESPACE
 
+#if QT_DEPRECATED_SINCE(5, 15)
+
 //
 //  W A R N I N G
 //  -------------
@@ -143,6 +145,8 @@ private:
 
 }
 
+#endif // QT_DEPRECATED_SINCE(5, 15)
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDXDGSHELLV6INTEGRATION_H
diff --git a/src/imports/compositor/qwaylandquickcompositorplugin.cpp b/src/imports/compositor/qwaylandquickcompositorplugin.cpp
index 287ae07df..8e98bfbce 100644
--- a/src/imports/compositor/qwaylandquickcompositorplugin.cpp
+++ b/src/imports/compositor/qwaylandquickcompositorplugin.cpp
@@ -170,10 +170,12 @@ public:
 #endif
         qmlRegisterType<QWaylandTextInputManagerQuickExtension>(uri, 1, 0, "TextInputManager");
 
+#if QT_DEPRECATED_SINCE(5, 15)
         qmlRegisterType<QWaylandXdgShellV6QuickExtension>(uri, 1, 1, "XdgShellV6");
         qmlRegisterType<QWaylandXdgSurfaceV6>(uri, 1, 1, "XdgSurfaceV6");
         qmlRegisterUncreatableType<QWaylandXdgToplevelV6>(uri, 1, 1, "XdgToplevelV6", QObject::tr("Cannot create instance of XdgShellToplevelV6"));
         qmlRegisterUncreatableType<QWaylandXdgPopupV6>(uri, 1, 1, "XdgPopupV6", QObject::tr("Cannot create instance of XdgShellPopupV6"));
+#endif
 
         qmlRegisterType<QWaylandXdgShellQuickExtension>(uri, 1, 3, "XdgShell");
         qmlRegisterType<QWaylandXdgSurface>(uri, 1, 3, "XdgSurface");