diff options
| author | Błażej Szczygieł <spaz16@wp.pl> | 2016-01-08 19:37:52 +0100 |
|---|---|---|
| committer | Błażej Szczygieł <spaz16@wp.pl> | 2016-02-06 09:59:04 +0000 |
| commit | e4fb521b3f3b9e59146b7569b72aee08dbaeb268 (patch) | |
| tree | 8e774007469d984d1fe6d7d11b270ab6b796b2fd /src/plugins/platforms/xcb/qxcbkeyboard.h | |
| parent | f669ea0d54302de31456d57286aa0e4ca1443e98 (diff) | |
xcb: XInput2 fixes, enter/leave event fixes
Added enter/leave event handling in XInput2 to avoid problems with
those events when the mouse is grabbed.
This commit amends: 53d289ec4c0f512a3475da4bbf1f940cd6838ace
This commit amends: ed2e15780385f7cf0a0d3aedc9cb2059d470bd58
Task-number: QTBUG-50340
Change-Id: I7a120b46daa4f8fa4c218346273ae90b6abfa156
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
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 d2e37d624c..457a27affb 100644 --- a/src/plugins/platforms/xcb/qxcbkeyboard.h +++ b/src/plugins/platforms/xcb/qxcbkeyboard.h @@ -68,7 +68,9 @@ public: void updateXKBMods(); quint32 xkbModMask(quint16 state); void updateXKBStateFromCore(quint16 state); +#ifdef XCB_USE_XINPUT22 void updateXKBStateFromXI(void *modInfo, void *groupInfo); +#endif #ifndef QT_NO_XKB // when XKEYBOARD is present on the X server int coreDeviceId() const { return core_device_id; } |