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/imports/compositor/qwaylandquickcompositorplugin.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/imports/compositor/qwaylandquickcompositorplugin.cpp')
| -rw-r--r-- | src/imports/compositor/qwaylandquickcompositorplugin.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/compositor/qwaylandquickcompositorplugin.cpp b/src/imports/compositor/qwaylandquickcompositorplugin.cpp index 73e21eb93..287ae07df 100644 --- a/src/imports/compositor/qwaylandquickcompositorplugin.cpp +++ b/src/imports/compositor/qwaylandquickcompositorplugin.cpp @@ -162,10 +162,12 @@ public: qmlRegisterType<QWaylandWlShellQuickExtension>(uri, 1, 0, "WlShell"); qmlRegisterType<QWaylandWlShellSurface>(uri, 1, 0, "WlShellSurface"); qmlRegisterType<QWaylandQuickShellSurfaceItem>(uri, 1, 0, "ShellSurfaceItem"); +#if QT_DEPRECATED_SINCE(5, 15) qmlRegisterUncreatableType<QWaylandXdgShellV5>(uri, 1, 0, "XdgShellV5Base", QObject::tr("Cannot create instance of XdgShellV5Base")); qmlRegisterType<QWaylandXdgShellV5QuickExtension>(uri, 1, 0, "XdgShellV5"); qmlRegisterType<QWaylandXdgSurfaceV5>(uri, 1, 0, "XdgSurfaceV5"); qmlRegisterType<QWaylandXdgPopupV5>(uri, 1, 0, "XdgPopupV5"); +#endif qmlRegisterType<QWaylandTextInputManagerQuickExtension>(uri, 1, 0, "TextInputManager"); qmlRegisterType<QWaylandXdgShellV6QuickExtension>(uri, 1, 1, "XdgShellV6"); |