diff --git a/src/gui/kernel/qkeymapper.cpp b/src/gui/kernel/qkeymapper.cpp index 274574f5613..f0ea66dc799 100644 --- a/src/gui/kernel/qkeymapper.cpp +++ b/src/gui/kernel/qkeymapper.cpp @@ -89,8 +89,6 @@ QList QKeyMapper::possibleKeys(QKeyEvent *e) extern bool qt_sendSpontaneousEvent(QObject *receiver, QEvent *event); // in qapplication_*.cpp void QKeyMapper::changeKeyboard() { - instance()->d_func()->clearMappings(); - // ## TODO: Support KeyboardLayoutChange on QPA #if 0 // inform all toplevel widgets of the change @@ -125,11 +123,6 @@ QKeyMapperPrivate::QKeyMapperPrivate() } QKeyMapperPrivate::~QKeyMapperPrivate() -{ - // clearMappings(); -} - -void QKeyMapperPrivate::clearMappings() { } diff --git a/src/gui/kernel/qkeymapper_p.h b/src/gui/kernel/qkeymapper_p.h index fd53747fddd..cb77deb6bad 100644 --- a/src/gui/kernel/qkeymapper_p.h +++ b/src/gui/kernel/qkeymapper_p.h @@ -88,7 +88,6 @@ public: QKeyMapperPrivate(); ~QKeyMapperPrivate(); - void clearMappings(); QList possibleKeys(QKeyEvent *e); QLocale keyboardInputLocale; diff --git a/src/plugins/platforms/cocoa/qcocoakeymapper.h b/src/plugins/platforms/cocoa/qcocoakeymapper.h index 339608d2924..7f20a371254 100644 --- a/src/plugins/platforms/cocoa/qcocoakeymapper.h +++ b/src/plugins/platforms/cocoa/qcocoakeymapper.h @@ -92,7 +92,6 @@ private: bool updateKeyboard(); void deleteLayouts(); KeyboardLayoutItem *keyMapForKey(unsigned short macVirtualKey, QChar unicodeKey) const; - void clearMappings(); QCFType m_currentInputSource = nullptr; diff --git a/src/plugins/platforms/cocoa/qcocoakeymapper.mm b/src/plugins/platforms/cocoa/qcocoakeymapper.mm index 7391f9079ab..589bbcad232 100644 --- a/src/plugins/platforms/cocoa/qcocoakeymapper.mm +++ b/src/plugins/platforms/cocoa/qcocoakeymapper.mm @@ -440,12 +440,6 @@ void QCocoaKeyMapper::deleteLayouts() } } -void QCocoaKeyMapper::clearMappings() -{ - deleteLayouts(); - updateKeyboard(); -} - static constexpr Qt::KeyboardModifiers modifierCombinations[] = { Qt::NoModifier, // 0 Qt::ShiftModifier, // 1