diff options
| author | Andrey Butirsky <butirsky@gmail.com> | 2023-03-22 19:40:58 +0700 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2023-03-31 08:07:02 +0000 |
| commit | c62b27346144945ac6ad37167548e705b9b2cbfa (patch) | |
| tree | e5998fd996b93f9bf467f29336287925720ec844 /src | |
| parent | 28f65aa68498c8c7514e888886f8f175cde2fb55 (diff) | |
| download | qtwayland-c62b27346144945ac6ad37167548e705b9b2cbfa.tar.gz | |
tests: fix tst_WaylandCompositor::simpleKeyboard()
since the default value of superAsMeta and hyperAsMeta in
QXkbCommon::keysymToQtKey() were changed in qtbase
610bafdfc58e90f24e3908e1a5932e2f510eac7e.
And Qt Wayland Compositor needs to distinguish Super/Hyper/Meta keys.
Fixes: QTBUG-111423
Change-Id: I531c4f6adc019e59d4a7d57853a459ea512028a2
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandkeyboard.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp index f8d494ab..8af7fbd8 100644 --- a/src/compositor/compositor_api/qwaylandkeyboard.cpp +++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp @@ -163,7 +163,7 @@ void QWaylandKeyboardPrivate::maybeUpdateXkbScanCodeTable() continue; Qt::KeyboardModifiers mods = {}; - int qtKey = QXkbCommon::keysymToQtKey(syms[0], mods); + int qtKey = QXkbCommon::keysymToQtKey(syms[0], mods, nullptr, 0, false, false); if (qtKey != 0) scanCodesByQtKey->insert({layout, qtKey}, keycode); } |