From: Giulio Camuffo Date: Fri, 2 Nov 2012 14:49:41 +0000 (+0100) Subject: Port to libxkbcommon 0.2.0. X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=41c62a3b93869e2ea267e016aa4c293d15482c0b;p=profile%2Fivi%2Fqtwayland.git Port to libxkbcommon 0.2.0. Change-Id: If2b76317c5c5addcbc45c0b3212cd2ce72ceab9c Reviewed-by: Andy Nichols --- diff --git a/libxkbcommon_sha1.txt b/libxkbcommon_sha1.txt index 3551302..95a1524 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: -9aee332e9fd470580611d789d8265f983b199fde +5be22ad641e96f76ce08a9fd928553b67d627de4 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/compositor/wayland_wrapper/wlinputdevice.cpp b/src/compositor/wayland_wrapper/wlinputdevice.cpp index 98a9b7c..2a04e56 100644 --- a/src/compositor/wayland_wrapper/wlinputdevice.cpp +++ b/src/compositor/wayland_wrapper/wlinputdevice.cpp @@ -352,10 +352,10 @@ void InputDevice::updateModifierState(uint code, int state) #ifndef QT_NO_WAYLAND_XKB xkb_state_update_key(m_state, code, state ? XKB_KEY_DOWN : XKB_KEY_UP); - uint32_t mods_depressed = xkb_state_serialize_mods(m_state, XKB_STATE_DEPRESSED); - uint32_t mods_latched = xkb_state_serialize_mods(m_state, XKB_STATE_LATCHED); - uint32_t mods_locked = xkb_state_serialize_mods(m_state, XKB_STATE_LATCHED); - uint32_t group = xkb_state_serialize_group(m_state, XKB_STATE_EFFECTIVE); + uint32_t mods_depressed = xkb_state_serialize_mods(m_state, (xkb_state_component)XKB_STATE_DEPRESSED); + uint32_t mods_latched = xkb_state_serialize_mods(m_state, (xkb_state_component)XKB_STATE_LATCHED); + uint32_t mods_locked = xkb_state_serialize_mods(m_state, (xkb_state_component)XKB_STATE_LATCHED); + uint32_t group = xkb_state_serialize_group(m_state, (xkb_state_component)XKB_STATE_EFFECTIVE); wl_keyboard *keyboard = keyboardDevice();