path: root/config_help.txt
diff options
authorGatis Paeglis <>2018-01-04 18:50:59 +0100
committerGatis Paeglis <>2018-02-24 12:15:08 +0000
commitd5abf545971da717014d316127045fc19edbcd65 (patch)
tree6bb3f2d97c9665f9e11e338940feae53d6f460ba /config_help.txt
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 'config_help.txt')
1 files changed, 0 insertions, 2 deletions
diff --git a/config_help.txt b/config_help.txt
index f61601ec7a..3e2c0c61b0 100644
--- a/config_help.txt
+++ b/config_help.txt
@@ -298,8 +298,6 @@ Gui, printing, widget options:
-xinput2 ........... Enable XInput2 support [auto]
-xkbcommon-x11 ..... Select xkbcommon used in combination with xcb
- -xkb-config-root <dir> ... With -qt-xkbcommon-x11, set default XKB config
- root <dir> [detect]
-xkbcommon-evdev ... Enable X-less xkbcommon in combination with libinput