diff options
| author | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2012-05-11 20:16:39 +0300 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2012-05-15 07:12:41 +0200 |
| commit | 8c56409598a2a0aa5023ab276c4fa4402bb23880 (patch) | |
| tree | 1f8b1ef569f8f1ee7b512f4b78de0f0ab9c43e32 | |
| parent | 25af63583b5e9b040d71d672e0550514a52678b5 (diff) | |
| download | qtwayland-8c56409598a2a0aa5023ab276c4fa4402bb23880.tar.gz | |
Yet another xkbcommon API change
Change-Id: I7ca4bf170cd6adb5b371c3c040ed35387876d0e8
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| -rw-r--r-- | config.tests/xkbcommon/main.cpp | 4 | ||||
| -rw-r--r-- | libxkbcommon_sha1.txt | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/wayland/qwaylandinputdevice.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/config.tests/xkbcommon/main.cpp b/config.tests/xkbcommon/main.cpp index 9eb8506d..1cb4cfd0 100644 --- a/config.tests/xkbcommon/main.cpp +++ b/config.tests/xkbcommon/main.cpp @@ -53,9 +53,9 @@ int main() names.variant = strdup(""); names.options = strdup(""); - xkb_context *context = xkb_context_new(); + xkb_context *context = xkb_context_new(xkb_context_flags(0)); if (context) { - xkb_keymap * keymap = xkb_map_new_from_names(context, &names); + xkb_keymap * keymap = xkb_map_new_from_names(context, &names, xkb_map_compile_flags(0)); if (keymap) { xkb_state *state = xkb_state_new(keymap); if (state) diff --git a/libxkbcommon_sha1.txt b/libxkbcommon_sha1.txt index 20a40f45..53b359bd 100644 --- a/libxkbcommon_sha1.txt +++ b/libxkbcommon_sha1.txt @@ -1,6 +1,6 @@ This version of Qt-Compositor is checked against the following sha1 from the libxkbcommon repository: -409ec8a12ef54f3eea704a8234e4cd26928bf87e +3fbc277bb8717d031f9c863935460b895c3d3beb During the qmake step a configuration test will be compiled to check if libxkbcommon is available. If not, or it is an incompatible diff --git a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp b/src/plugins/platforms/wayland/qwaylandinputdevice.cpp index 7cfe56df..6f2d7b71 100644 --- a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp +++ b/src/plugins/platforms/wayland/qwaylandinputdevice.cpp @@ -91,9 +91,9 @@ QWaylandInputDevice::QWaylandInputDevice(QWaylandDisplay *display, names.variant = strdup(""); names.options = strdup(""); - xkb_context *mXkbContext = xkb_context_new(); + xkb_context *mXkbContext = xkb_context_new(xkb_context_flags(0)); if (mXkbContext) { - mXkbMap = xkb_map_new_from_names(mXkbContext, &names); + mXkbMap = xkb_map_new_from_names(mXkbContext, &names, xkb_map_compile_flags(0)); if (mXkbMap) { mXkbState = xkb_state_new(mXkbMap); } |