diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2020-02-04 16:32:58 +0100 |
|---|---|---|
| committer | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2020-02-05 13:26:01 +0100 |
| commit | 9a73873125e9caebc8810b7d331e220890ceb4af (patch) | |
| tree | b4bccfd59fa4ac6530c9f650ab277a7d985daae0 /src/compositor/extensions/qwaylandxdgshellv5.cpp | |
| parent | 9135dec42de1880bd8b2972ba01f97a219cb0093 (diff) | |
Compositor: Deprecate XdgShell unstable v5
A stable version of XdgShell has been released. Since xdg-shell v5 is quite
different from both the stable version and wl-shell with regards to how
configure events work, it would be a maintenance burden to keep supporting it
in Qt 6.
[ChangeLog][Compositor] XdgShellV5 has been deprecated, use XdgShell instead.
Task-number: QTBUG-81853
Change-Id: I06ffc676cb8c9c1a46de30eef59ceef8bb0ff7a3
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
Diffstat (limited to 'src/compositor/extensions/qwaylandxdgshellv5.cpp')
| -rw-r--r-- | src/compositor/extensions/qwaylandxdgshellv5.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/compositor/extensions/qwaylandxdgshellv5.cpp b/src/compositor/extensions/qwaylandxdgshellv5.cpp index 337540fc3..c6ef34e7b 100644 --- a/src/compositor/extensions/qwaylandxdgshellv5.cpp +++ b/src/compositor/extensions/qwaylandxdgshellv5.cpp @@ -47,6 +47,8 @@ QT_BEGIN_NAMESPACE +#if QT_DEPRECATED_SINCE(5, 15) + QWaylandSurfaceRole QWaylandXdgSurfaceV5Private::s_role("xdg_surface"); QWaylandSurfaceRole QWaylandXdgPopupV5Private::s_role("xdg_popup"); @@ -493,6 +495,7 @@ void QWaylandXdgPopupV5Private::xdg_popup_destroy(Resource *resource) * \qmltype XdgShellV5 * \inqmlmodule QtWayland.Compositor * \since 5.8 + * \obsolete * \brief Provides an extension for desktop-style user interfaces. * * The XdgShellV5 extension provides a way to associate an XdgSurfaceV5 @@ -522,6 +525,7 @@ void QWaylandXdgPopupV5Private::xdg_popup_destroy(Resource *resource) * \class QWaylandXdgShellV5 * \inmodule QtWaylandCompositor * \since 5.8 + * \obsolete * \brief The QWaylandXdgShellV5 class is an extension for desktop-style user interfaces. * * The QWaylandXdgShellV5 extension provides a way to associate a QWaylandXdgSurfaceV5 with @@ -756,6 +760,7 @@ void QWaylandXdgShellV5::handleFocusChanged(QWaylandSurface *newSurface, QWaylan * \qmltype XdgSurfaceV5 * \inqmlmodule QtWayland.Compositor * \since 5.8 + * \obsolete * \brief Provides a \c xdg_surface that offers desktop-style compositor-specific features to a surface. * * This type is part of the \l{XdgShellV5} extension and provides a way to extend @@ -771,6 +776,7 @@ void QWaylandXdgShellV5::handleFocusChanged(QWaylandSurface *newSurface, QWaylan * \class QWaylandXdgSurfaceV5 * \inmodule QtWaylandCompositor * \since 5.8 + * \obsolete * \brief The QWaylandXdgSurfaceV5 class provides desktop-style compositor-specific features to an xdg surface. * * This class is part of the QWaylandXdgShellV5 extension and provides a way to @@ -1355,6 +1361,7 @@ QWaylandQuickShellIntegration *QWaylandXdgSurfaceV5::createIntegration(QWaylandQ * \qmltype XdgPopupV5 * \inqmlmodule QtWayland.Compositor * \since 5.8 + * \obsolete * \brief Provides a \c xdg_popup interface that implements popup features for the xdg-shell protocol. * * This type is part of the \l{XdgShellV5} extension and provides a way to extend @@ -1370,6 +1377,7 @@ QWaylandQuickShellIntegration *QWaylandXdgSurfaceV5::createIntegration(QWaylandQ * \class QWaylandXdgPopupV5 * \inmodule QtWaylandCompositor * \since 5.8 + * \obsolete * \brief The QWaylandXdgPopupV5 class provides menus for an xdg surface. * * This class is part of the QWaylandXdgShellV5 extension and provides a way to @@ -1551,4 +1559,6 @@ QWaylandQuickShellIntegration *QWaylandXdgPopupV5::createIntegration(QWaylandQui } #endif +#endif // QT_DEPRECATED_SINCE(5, 15) + QT_END_NAMESPACE |