diff options
| author | Gatis Paeglis <gatis.paeglis@qt.io> | 2018-01-04 18:50:59 +0100 |
|---|---|---|
| committer | Gatis Paeglis <gatis.paeglis@qt.io> | 2018-02-24 12:15:08 +0000 |
| commit | d5abf545971da717014d316127045fc19edbcd65 (patch) | |
| tree | 6bb3f2d97c9665f9e11e338940feae53d6f460ba /src/gui/configure.json | |
| parent | 9280a04afebef9ee992e75c469e29c0c443b66c6 (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 <shawn.rutledge@qt.io>
Diffstat (limited to 'src/gui/configure.json')
| -rw-r--r-- | src/gui/configure.json | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index 27e913877f..220662ea8e 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -46,7 +46,6 @@ "xcb-xlib": "boolean", "xinput2": "boolean", "xkb": "boolean", - "xkb-config-root": "string", "xkbcommon": { "type": "enum", "values": [ "no", "qt", "system" ] }, "xkbcommon-evdev": "boolean", "xkbcommon-x11": { "type": "enum", "name": "xkbcommon", "values": [ "no", "qt", "system" ] } @@ -624,8 +623,7 @@ }, "testTypeAliases": { - "files": [ "directX" ], - "getPkgConfigVariable": [ "xkbConfigRoot" ] + "files": [ "directX" ] }, "tests": { @@ -888,13 +886,6 @@ "value": "/usr", "log": "value" }, - "xkbconfigroot": { - "label": "XKB config root", - "type": "xkbConfigRoot", - "pkg-config-args": "xkeyboard-config", - "pkg-config-variable": "xkb_base", - "log": "value" - }, "xlib": { "label": "XLib", "type": "compile", @@ -1355,12 +1346,6 @@ "condition": "libs.xkbcommon_x11", "output": [ "privateFeature" ] }, - "xkb-config-root": { - "label": "XKB config root", - "emitIf": "features.xcb", - "condition": "features.xcb && !features.xkbcommon-system && tests.xkbconfigroot", - "output": [ { "type": "varAssign", "name": "QMAKE_XKB_CONFIG_ROOT", "value": "tests.xkbconfigroot.value"} ] - }, "xlib": { "label": "XLib", "autoDetect": "!config.darwin || features.xcb", @@ -1580,12 +1565,6 @@ "report": [ { - "type": "warning", - "condition": "features.xcb && !features.xkbcommon-system && !features.xkb-config-root", - "message": "Could not find XKB config root, use -xkb-config-root to set a path to -XKB configuration data. This is required for keyboard input support." - }, - { "type": "note", "condition": "features.xcb && config.darwin", "message": "XCB support on macOS is minimal and untested. Some features will |