From 7614f0ee212327719ba99c41410fa02b12d4e1d0 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 27 Apr 2022 09:24:21 +0200 Subject: Revert "xcb: stablilize xkb state when keymap updated" This reverts commit 27c25fc909c19ddc4750f36d26b7c500db9eb0ab. Currently Qt only supports core device of keyboard, not every real keyboard. Create a new xkb state during xcb_xkb_new_keyboard_notify_event_t, it will lose the correct state before the event, for example, when using the second or later layout than the first one. The new xkb state will use the first layout. It's difficult to sync the xkb states. Fixes: QTBUG-102493 Fixes: QTBUG-102640 Task-number: QTBUG-95933 Change-Id: Iaa5369ff9f5495e194577dcbb8f78303158c9a73 Reviewed-by: Lu YaNing Reviewed-by: Zhang Hao <543985125@qq.com> Reviewed-by: Liang Qi Reviewed-by: Ilya Fedin (cherry picked from commit 9b92c5314e8362f5473611ea0d06f403836df5dd) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/platforms/xcb/qxcbconnection.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/platforms/xcb/qxcbconnection.cpp') diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp index 8f22a4db13..c667de0f78 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection.cpp @@ -750,7 +750,7 @@ void QXcbConnection::handleXcbEvent(xcb_generic_event_t *event) case XCB_XKB_NEW_KEYBOARD_NOTIFY: { xcb_xkb_new_keyboard_notify_event_t *ev = &xkb_event->new_keyboard_notify; if (ev->changed & XCB_XKB_NKN_DETAIL_KEYCODES) - m_keyboard->updateKeymap(ev); + m_keyboard->updateKeymap(); break; } default: -- cgit v1.2.3 From a7e83faa87cb2a626c5c1d32d537b7fee14a0b7b Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 4 May 2022 11:53:27 +0200 Subject: includemocs (updated script) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The updated script found some more. Manual conflict resolutions: - dropped additions to non-existing files Task-number: QTBUG-102886 Change-Id: Ic8062e8a441c4d1a3718598a21f7f2e050a17cae Reviewed-by: Fabian Kosmale (cherry picked from commit 9641b68c9cb9383168d2e87438f89bfcb127e08c) Reviewed-by: Qt CI Bot Reviewed-by: Mårten Nordheim --- src/plugins/platforms/xcb/qxcbconnection.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/plugins/platforms/xcb/qxcbconnection.cpp') diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp index c667de0f78..4efb10151d 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection.cpp @@ -1199,3 +1199,5 @@ void QXcbConnectionGrabber::release() } QT_END_NAMESPACE + +#include "moc_qxcbconnection.cpp" -- cgit v1.2.3