diff options
author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2016-11-22 13:37:10 +0100 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@qt.io> | 2016-12-06 08:42:44 +0000 |
commit | e2f856d9da896c202d98b179b9482fe7e7b57222 (patch) | |
tree | d9b79e62827a2eae39c819f8a963a7637a3e620c /src/client/qwaylandwlshellintegration_p.h | |
parent | 542c6392ca52f86bd5fffb6141e93ad2a1ab8fcb (diff) |
Deprecate QT_WAYLAND_USE_XDG_SHELL
In favor of QT_WAYLAND_SHELL_INTEGRATION, which can be set to:
- ivi-shell
- wl-shell
- xdg-shell-v5
- xdg-shell-v6
Change-Id: Ie2ca1184f22dcac56beb441329ea8b5a9a81baf4
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/client/qwaylandwlshellintegration_p.h')
-rw-r--r-- | src/client/qwaylandwlshellintegration_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/client/qwaylandwlshellintegration_p.h b/src/client/qwaylandwlshellintegration_p.h index 9082c7628..393ccaf0a 100644 --- a/src/client/qwaylandwlshellintegration_p.h +++ b/src/client/qwaylandwlshellintegration_p.h @@ -57,11 +57,13 @@ namespace QtWaylandClient { class Q_WAYLAND_CLIENT_EXPORT QWaylandWlShellIntegration : public QWaylandShellIntegration { public: - QWaylandWlShellIntegration(QWaylandDisplay* display); + static QWaylandWlShellIntegration *create(QWaylandDisplay* display); bool initialize(QWaylandDisplay *) Q_DECL_OVERRIDE; QWaylandShellSurface *createShellSurface(QWaylandWindow *window) Q_DECL_OVERRIDE; private: + QWaylandWlShellIntegration(QWaylandDisplay* display); + QtWayland::wl_shell *m_wlShell; }; |