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/xkbcomp-priv.h | |
| 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/xkbcomp-priv.h')
| -rw-r--r-- | src/3rdparty/xkbcommon/src/xkbcomp/xkbcomp-priv.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/3rdparty/xkbcommon/src/xkbcomp/xkbcomp-priv.h b/src/3rdparty/xkbcommon/src/xkbcomp/xkbcomp-priv.h index 4d421b5f2f..6cb774da17 100644 --- a/src/3rdparty/xkbcommon/src/xkbcomp/xkbcomp-priv.h +++ b/src/3rdparty/xkbcommon/src/xkbcomp/xkbcomp-priv.h @@ -45,12 +45,9 @@ XkbParseFile(struct xkb_context *ctx, FILE *file, const char *file_name, const char *map); XkbFile * -XkbParseString(struct xkb_context *ctx, const char *string, - const char *file_name); - -XkbFile * -XkbParseBuffer(struct xkb_context *ctx, char *buf, size_t length, - const char *file_name); +XkbParseString(struct xkb_context *ctx, + const char *string, size_t len, + const char *file_name, const char *map); void FreeXkbFile(XkbFile *file); @@ -79,9 +76,6 @@ bool CompileKeymap(XkbFile *file, struct xkb_keymap *keymap, enum merge_mode merge); -bool -LookupKeysym(const char *str, xkb_keysym_t *sym_rtrn); - /***====================================================================***/ static inline bool |