path: root/src/3rdparty/xkbcommon.pri
diff options
authorGatis Paeglis <>2018-01-04 18:50:59 +0100
committerGatis Paeglis <>2018-02-24 12:15:08 +0000
commitd5abf545971da717014d316127045fc19edbcd65 (patch)
tree6bb3f2d97c9665f9e11e338940feae53d6f460ba /src/3rdparty/xkbcommon.pri
parent9280a04afebef9ee992e75c469e29c0c443b66c6 (diff)
xcb: re-factor QXcbKeyboard::updateKeymap() to remove various fallbacks
3edcd9420e3ad661cad89420e18dbb70e7ad450b added more robust support for keyboard input on XKeyboard-less X servers. The various fallbacks that we had did not work that well in practice. We can remove them now. The xkb_keymap_new_from_names() function relies on reading XKB config files from a file system. Since we don't use this function anymore, we can also simplify xkb context creation (see XKB_CONTEXT_NO_DEFAULT_INCLUDES), as we don't care about DFLT_XKB_CONFIG_ROOT (which we previously set via -xkb-config-root for the bundled libxkbcommon). This patch also changes the code to use smart pointers for managing the global xkb context, keymap and state. [ChangeLog][X11] The -xkb-config-root command line switch has been removed as it it no longer needed when configuring with -qt-xkbcommon-x11. Change-Id: I80eecf83adae90af5cd20df434c1fba0358a12fd Reviewed-by: Shawn Rutledge <>
Diffstat (limited to 'src/3rdparty/xkbcommon.pri')
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/xkbcommon.pri b/src/3rdparty/xkbcommon.pri
index af71b232d5..1d953d8372 100644
--- a/src/3rdparty/xkbcommon.pri
+++ b/src/3rdparty/xkbcommon.pri
@@ -6,7 +6,7 @@ INCLUDEPATH += $$PWD/xkbcommon \
+DEFINES += DFLT_XKB_CONFIG_ROOT='\\"/usr/share/X11/xkb\\"' # unused, but needs to be set to something
### RMLVO names can be overwritten with environmental variables (see libxkbcommon documentation)