diff options
| author | Gatis Paeglis <gatis.paeglis@digia.com> | 2014-03-28 16:22:14 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-03 14:20:19 +0200 |
| commit | bd40a7cc446cafb8c9922d7d19845da580868859 (patch) | |
| tree | 966292563ebe2541ee6129c0d9ce42409f4a24fe /src/3rdparty/xkbcommon/xkbcommon/xkbcommon-compat.h | |
| parent | 151cf2047aa36ac395a841a3ced8b2142a997aec (diff) | |
Update bundled libxkbcommon version to 0.4.1
This is the latest version, released on Mar 27 2014. It includes:
https://bugs.freedesktop.org/show_bug.cgi?id=75798
https://bugs.freedesktop.org/show_bug.cgi?id=75892
Required for fixing input when running Qt application on Mac OS X
with XQuartz and for fixing QTBUG-36281.
Change-Id: Idc4d3c99a4008a10b91ab51c8910b36909974703
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty/xkbcommon/xkbcommon/xkbcommon-compat.h')
| -rw-r--r-- | src/3rdparty/xkbcommon/xkbcommon/xkbcommon-compat.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/3rdparty/xkbcommon/xkbcommon/xkbcommon-compat.h b/src/3rdparty/xkbcommon/xkbcommon/xkbcommon-compat.h index f96e4c806f..299732fdc3 100644 --- a/src/3rdparty/xkbcommon/xkbcommon/xkbcommon-compat.h +++ b/src/3rdparty/xkbcommon/xkbcommon/xkbcommon-compat.h @@ -91,4 +91,8 @@ #define xkb_state_get_map(state) xkb_state_get_keymap(state) +/* Not needed anymore, since there's NO_FLAGS. */ +#define XKB_MAP_COMPILE_PLACEHOLDER XKB_KEYMAP_COMPILE_NO_FLAGS +#define XKB_MAP_COMPILE_NO_FLAGS XKB_KEYMAP_COMPILE_NO_FLAGS + #endif |