diff options
author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2016-09-07 16:32:05 +0200 |
---|---|---|
committer | Johan Helsing <johan.helsing@qt.io> | 2016-09-30 14:21:39 +0000 |
commit | 04c05e9a53f4fe59c58967809b91ea792b6cffbd (patch) | |
tree | 280aebaeef2349da8373bf6c7e00ad84665b27fc /src/compositor/compositor_api/qwaylandseat_p.h | |
parent | 5372ec5c131e23cccfbabc43d700ffbbbad973ec (diff) |
Make QWaylandKeymap a QObject
This makes it possible to use defaultSeat declaratively by allowing it to be
uninitialized until the QWaylandCompositor::create has been called.
Change-Id: I962cc7cc82a0bbc9240abb50cf92dee77e4a0ba6
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@hawaiios.org>
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/compositor/compositor_api/qwaylandseat_p.h')
-rw-r--r-- | src/compositor/compositor_api/qwaylandseat_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/qwaylandseat_p.h b/src/compositor/compositor_api/qwaylandseat_p.h index 6588600cf..eb86aec37 100644 --- a/src/compositor/compositor_api/qwaylandseat_p.h +++ b/src/compositor/compositor_api/qwaylandseat_p.h @@ -90,7 +90,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandSeatPrivate : public QObjectPrivate, p public: Q_DECLARE_PUBLIC(QWaylandSeat) - QWaylandSeatPrivate(QWaylandSeat *seat, QWaylandCompositor *compositor); + QWaylandSeatPrivate(QWaylandSeat *seat); ~QWaylandSeatPrivate(); void clientRequestedDataDevice(QtWayland::DataDeviceManager *dndSelection, struct wl_client *client, uint32_t id); @@ -113,6 +113,7 @@ protected: void seat_destroy_resource(wl_seat::Resource *resource) Q_DECL_OVERRIDE; private: + bool isInitialized; QWaylandCompositor *compositor; QWaylandView *mouseFocus; QWaylandSurface *keyboardFocus; @@ -123,6 +124,7 @@ private: QScopedPointer<QWaylandTouch> touch; QScopedPointer<QtWayland::DataDevice> data_device; QScopedPointer<QWaylandDrag> drag_handle; + QScopedPointer<QWaylandKeymap> keymap; }; |