diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-28 10:47:01 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-28 12:24:42 +0200 |
commit | 6169341cbbeebdd6deed7c012b2ba79e1f6d95ff (patch) | |
tree | dd3dd688eabf504913df465bb1a384521fcafda4 /src/compositor/wayland_wrapper/qwlkeyboard_p.h | |
parent | 87499ddd653fb20796c2dd2eabac37b45240ef1c (diff) | |
parent | 3dc9cfdbd2771c28c770d432b99e571db43fe599 (diff) |
Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-alpha1
Conflicts:
src/client/qwaylandwindow.cpp
Change-Id: I80ead87f3e1f36299b1bf9cc9c7db6cd48c0e86f
Diffstat (limited to 'src/compositor/wayland_wrapper/qwlkeyboard_p.h')
-rw-r--r-- | src/compositor/wayland_wrapper/qwlkeyboard_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/compositor/wayland_wrapper/qwlkeyboard_p.h b/src/compositor/wayland_wrapper/qwlkeyboard_p.h index d394aad1b..c4df31266 100644 --- a/src/compositor/wayland_wrapper/qwlkeyboard_p.h +++ b/src/compositor/wayland_wrapper/qwlkeyboard_p.h @@ -127,6 +127,7 @@ private: #ifndef QT_NO_WAYLAND_XKB void initXKB(); void createXKBKeymap(); + void createXKBState(xkb_keymap *keymap); #endif Compositor *m_compositor; |