diff options
| author | Gatis Paeglis <gatis.paeglis@qt.io> | 2018-12-14 21:07:08 +0100 |
|---|---|---|
| committer | Gatis Paeglis <gatis.paeglis@qt.io> | 2019-04-25 07:00:09 +0000 |
| commit | 23453c30084d09d7325e113bbc3d0637c51cb3e7 (patch) | |
| tree | 6fe61eaeb57f0b6c928325af433439113fded158 /src/compositor/compositor_api/qwaylandkeyboard.cpp | |
| parent | 88c47136d57edc45bddd0bec4ce7953b191f4a42 (diff) | |
drop qwaylandxkb and share the logic with X11
QtWayland can benefit from sharing code with X11.
This will fix issues that have been reported and fixed on XCB
a long time ago.
Task-number: QTBUG-65503
Fixes: QTBUG-71301
Fixes: QTBUG-66497
Change-Id: I09cbf8e1c9cf29e8d7f46b97bc2f11d6e91b61a5
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Diffstat (limited to 'src/compositor/compositor_api/qwaylandkeyboard.cpp')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandkeyboard.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp index f66fe3263..ffe536ce3 100644 --- a/src/compositor/compositor_api/qwaylandkeyboard.cpp +++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp @@ -54,7 +54,6 @@ #if QT_CONFIG(xkbcommon) #include <sys/mman.h> #include <sys/types.h> -#include <qwaylandxkb_p.h> #endif QT_BEGIN_NAMESPACE @@ -206,7 +205,7 @@ void QWaylandKeyboardPrivate::maybeUpdateXkbScanCodeTable() continue; Qt::KeyboardModifiers mods = {}; - int qtKey = QWaylandXkb::keysymToQtKey(syms[0], mods).first; + int qtKey = QXkbCommon::keysymToQtKey(syms[0], mods); if (qtKey != 0) scanCodesByQtKey->insert({layout, qtKey}, keycode); } |