summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/xcb/qxcbkeyboard.h
diff options
context:
space:
mode:
authorGatis Paeglis <gatis.paeglis@qt.io>2018-01-04 17:15:28 +0100
committerGatis Paeglis <gatis.paeglis@qt.io>2018-02-24 12:15:00 +0000
commit9280a04afebef9ee992e75c469e29c0c443b66c6 (patch)
tree9397b8adfb06c3333483b215b42f1c115cb8135c /src/plugins/platforms/xcb/qxcbkeyboard.h
parentbcd5532fcb8442d930721f0c8048c764f4cbbf1e (diff)
xcb: remove xlib dependency from core keymap assembling
Remove the Xlib dependency by extracting XConvertCase from libxkbcommon sources (xkbcommon/src/keysym.c). libxkbcommon >= 0.8.0 exposes case conversion APIs, but we should prefer using the slightly adjusted version (see the patch for more details). This change also is necessary for follow-up cleanups. Change-Id: Icf1716e0ad26f46a7aefb23722cfc57957754d5e Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbkeyboard.h')
-rw-r--r--src/plugins/platforms/xcb/qxcbkeyboard.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/platforms/xcb/qxcbkeyboard.h b/src/plugins/platforms/xcb/qxcbkeyboard.h
index 5cb91ed315..8ea16f099b 100644
--- a/src/plugins/platforms/xcb/qxcbkeyboard.h
+++ b/src/plugins/platforms/xcb/qxcbkeyboard.h
@@ -94,9 +94,8 @@ protected:
void readXKBConfig();
void clearXKBConfig();
-#if QT_CONFIG(xcb_xlib)
struct xkb_keymap *keymapFromCore();
-#endif
+
// when XKEYBOARD not present on the X server
void updateModifiers();
typedef QMap<xcb_keysym_t, int> KeysymModifierMap;