diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-22 07:28:34 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-22 07:28:34 +0200 |
| commit | 50908f023d83257dbc0b6d17bfe29e2f101615af (patch) | |
| tree | de68e2d9587db1fb59d75505981b6ff033e12992 /src/plugins/platforms/xcb/qxcbkeyboard.h | |
| parent | 7555a925816e3244073803f0adc4d44640f5ac1d (diff) | |
| parent | d10e4c193b0152350e884adcc1060aabd1a974f7 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/plugins/platforms/ios/qiosviewcontroller.mm
Change-Id: I2dda31867cbc79ea7fe965f52afb518aefa4ad20
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbkeyboard.h')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbkeyboard.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbkeyboard.h b/src/plugins/platforms/xcb/qxcbkeyboard.h index 817b57ff5b..dfd2926435 100644 --- a/src/plugins/platforms/xcb/qxcbkeyboard.h +++ b/src/plugins/platforms/xcb/qxcbkeyboard.h @@ -104,6 +104,8 @@ protected: void checkForLatinLayout(); private: + void updateXKBStateFromState(struct xkb_state *kb_state, quint16 state); + bool m_config; xcb_keycode_t m_autorepeat_code; |