diff options
| author | Gatis Paeglis <gatis.paeglis@qt.io> | 2018-12-14 17:14:06 +0100 |
|---|---|---|
| committer | Gatis Paeglis <gatis.paeglis@qt.io> | 2019-04-16 10:14:30 +0000 |
| commit | 458bc86f82f8fa6cfd659950549d1d2b36e5e40d (patch) | |
| tree | 21d367bc0618a3d56eb64c3ccff0a2fd61c77147 /src/shared | |
| parent | 60dc973ab2c9227e2b6161a8b61a8c129e8b8cbc (diff) | |
xkbcommon: replace deprecated APIsv5.13.0-beta3
See xkbcommon/xkbcommon-compat.h
Change-Id: I2a70e14481db227fc0be657fbcf4f6550d62e7e8
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/qwaylandxkb.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/shared/qwaylandxkb.cpp b/src/shared/qwaylandxkb.cpp index 3cfc4b074..6a81e9fd4 100644 --- a/src/shared/qwaylandxkb.cpp +++ b/src/shared/qwaylandxkb.cpp @@ -342,15 +342,13 @@ Qt::KeyboardModifiers QWaylandXkb::modifiers(struct xkb_state *state) #if QT_CONFIG(xkbcommon) Qt::KeyboardModifiers modifiers = Qt::NoModifier; - xkb_state_component cstate = static_cast<xkb_state_component>(XKB_STATE_DEPRESSED | XKB_STATE_LATCHED | XKB_STATE_LOCKED); - - if (xkb_state_mod_name_is_active(state, XKB_MOD_NAME_SHIFT, cstate)) + if (xkb_state_mod_name_is_active(state, XKB_MOD_NAME_SHIFT, XKB_STATE_MODS_EFFECTIVE)) modifiers |= Qt::ShiftModifier; - if (xkb_state_mod_name_is_active(state, XKB_MOD_NAME_CTRL, cstate)) + if (xkb_state_mod_name_is_active(state, XKB_MOD_NAME_CTRL, XKB_STATE_MODS_EFFECTIVE)) modifiers |= Qt::ControlModifier; - if (xkb_state_mod_name_is_active(state, XKB_MOD_NAME_ALT, cstate)) + if (xkb_state_mod_name_is_active(state, XKB_MOD_NAME_ALT, XKB_STATE_MODS_EFFECTIVE)) modifiers |= Qt::AltModifier; - if (xkb_state_mod_name_is_active(state, XKB_MOD_NAME_LOGO, cstate)) + if (xkb_state_mod_name_is_active(state, XKB_MOD_NAME_LOGO, XKB_STATE_MODS_EFFECTIVE)) modifiers |= Qt::MetaModifier; return modifiers; |