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/qwaylandkeyboard_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/qwaylandkeyboard_p.h')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandkeyboard_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/compositor/compositor_api/qwaylandkeyboard_p.h b/src/compositor/compositor_api/qwaylandkeyboard_p.h index ac306282e..fc43853cc 100644 --- a/src/compositor/compositor_api/qwaylandkeyboard_p.h +++ b/src/compositor/compositor_api/qwaylandkeyboard_p.h @@ -91,7 +91,7 @@ public: void keyEvent(uint code, uint32_t state); void sendKeyEvent(uint code, uint32_t state); void updateModifierState(uint code, uint32_t state); - void updateKeymap(); + void maybeUpdateKeymap(); void checkFocusResource(Resource *resource); void sendEnter(QWaylandSurface *surface, Resource *resource); @@ -123,7 +123,6 @@ private: uint32_t modsLocked; uint32_t group; - QWaylandKeymap keymap; bool pendingKeymap; #ifndef QT_NO_WAYLAND_XKB size_t keymap_size; |