Commit b587e4c0 authored by Liang Qi's avatar Liang Qi Committed by Qt Cherry-pick Bot
Browse files

Revert "Qt xcb: remove false detects of Qt::GroupSwitchModifier"

This reverts commit 25a7034d

.

The change makes the 5th modifier key broken, which is more
serious than Backspace key doesn't work in CapsLock on.

And we don't have a better solution for both of them now,
perhaps it's better to keep the old behavior in 6.2 LTS.

Task-number: QTBUG-49771
Fixes: QTBUG-95108
Fixes: QTBUG-95289
Change-Id: Ie5d0aafa562b5097e089cafc83ae227c75c6d752
Reviewed-by: default avatarTor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit bb4b40b7

)
Reviewed-by: default avatarQt Cherry-pick Bot <cherrypick_bot@qt-project.org>
parent 4b14f3cd
......@@ -60,11 +60,11 @@ Qt::KeyboardModifiers QXcbKeyboard::translateModifiers(int s) const
ret |= Qt::ShiftModifier;
if (s & XCB_MOD_MASK_CONTROL)
ret |= Qt::ControlModifier;
if ((s & rmod_masks.alt) == rmod_masks.alt)
if (s & rmod_masks.alt)
ret |= Qt::AltModifier;
if ((s & rmod_masks.meta) == rmod_masks.meta)
if (s & rmod_masks.meta)
ret |= Qt::MetaModifier;
if ((s & rmod_masks.altgr) == rmod_masks.altgr)
if (s & rmod_masks.altgr)
ret |= Qt::GroupSwitchModifier;
return ret;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment