From c62b27346144945ac6ad37167548e705b9b2cbfa Mon Sep 17 00:00:00 2001 From: Andrey Butirsky Date: Wed, 22 Mar 2023 19:40:58 +0700 Subject: tests: fix tst_WaylandCompositor::simpleKeyboard() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Tor Arne Vestbø --- src/compositor/compositor_api/qwaylandkeyboard.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp index f8d494ab1..8af7fbd8c 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); } -- cgit v1.2.3