diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-26 20:55:01 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-26 20:55:01 +0100 |
| commit | 32da9ae38969c2e4f01968401339433e7909eed8 (patch) | |
| tree | afe1b708d2dd22fcda239d8a9808468e3d84d931 /src/plugins/platforms/xcb/qxcbconnection.cpp | |
| parent | 8a9f77ead179ce88df5113290fa0201872fcd74e (diff) | |
| parent | b2d2b655e58d5337765c26dafa836b12e019c6a4 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I5a919ac999c4c5a3ca2024b63a78c094a44a1191
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbconnection.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp index 1e3bb69069..7d213320a4 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection.cpp @@ -1132,7 +1132,7 @@ void QXcbConnection::handleXcbEvent(xcb_generic_event_t *event) m_keyboard->updateXKBStateFromCore(((xcb_key_release_event_t *)event)->state); HANDLE_KEYBOARD_EVENT(xcb_key_release_event_t, handleKeyReleaseEvent); case XCB_MAPPING_NOTIFY: - m_keyboard->handleMappingNotifyEvent(reinterpret_cast<xcb_mapping_notify_event_t *>(event)); + m_keyboard->updateKeymap(reinterpret_cast<xcb_mapping_notify_event_t *>(event)); break; case XCB_SELECTION_REQUEST: { @@ -1220,7 +1220,7 @@ void QXcbConnection::handleXcbEvent(xcb_generic_event_t *event) handled = true; break; case XCB_XKB_MAP_NOTIFY: - m_keyboard->handleMappingNotifyEvent(&xkb_event->map_notify); + m_keyboard->updateKeymap(); handled = true; break; case XCB_XKB_NEW_KEYBOARD_NOTIFY: { |