diff options
| author | Gatis Paeglis <gatis.paeglis@digia.com> | 2014-02-05 16:25:06 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-19 15:42:13 +0100 |
| commit | b19b0808940c8c54b102012be134a370b26e348e (patch) | |
| tree | 63d951814f771e87508be7b0f8d4346d0079dc05 /src/3rdparty/xkbcommon/src/xkbcomp/types.c | |
| parent | c6b555dac389f9a599a9ad342de56dea329fff60 (diff) | |
Update bundled libxkbcommon version to 0.4.0
This release comes with important bug fixes. Also we can now
remove the workaround code which was needed for libxkbcommon 0.2.0.
Task-number: QTBUG-31712
Task-number: QTBUG-33732
Task-number: QTBUG-34056
Change-Id: I57caf7f803b9a01a15541a5ad82e464de3b8abbb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty/xkbcommon/src/xkbcomp/types.c')
| -rw-r--r-- | src/3rdparty/xkbcommon/src/xkbcomp/types.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/3rdparty/xkbcommon/src/xkbcomp/types.c b/src/3rdparty/xkbcommon/src/xkbcomp/types.c index 1eb1b73205..5b7ccbb4db 100644 --- a/src/3rdparty/xkbcommon/src/xkbcomp/types.c +++ b/src/3rdparty/xkbcommon/src/xkbcomp/types.c @@ -197,16 +197,6 @@ ReportTypeBadType(KeyTypesInfo *info, KeyTypeInfo *type, TypeTxt(info, type), wanted); } -static inline bool -ReportTypeBadWidth(KeyTypesInfo *info, const char *type, int has, int needs) -{ - log_err(info->keymap->ctx, - "Key type \"%s\" has %d levels, must have %d; " - "Illegal type definition ignored\n", - type, has, needs); - return false; -} - /***====================================================================***/ static void @@ -775,6 +765,7 @@ static bool CopyKeyTypesToKeymap(struct xkb_keymap *keymap, KeyTypesInfo *info) { keymap->types_section_name = strdup_safe(info->name); + XkbEscapeMapName(keymap->types_section_name); keymap->num_types = darray_size(info->types); if (keymap->num_types == 0) @@ -793,7 +784,7 @@ CopyKeyTypesToKeymap(struct xkb_keymap *keymap, KeyTypesInfo *info) type->num_levels = 1; type->entries = NULL; type->num_entries = 0; - type->name = xkb_atom_intern(keymap->ctx, "default"); + type->name = xkb_atom_intern_literal(keymap->ctx, "default"); type->level_names = NULL; return true; |