diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2020-12-04 15:04:49 +0100 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2021-01-20 12:29:38 +0100 |
| commit | 15576c961047231a49afda9b9ee0159ba132c0ae (patch) | |
| tree | d2ff922cd5a3f910471d69380ea12ce99155a212 /src/plugins/platforms/cocoa/qcocoaintegration.mm | |
| parent | a5bb7b3ca510c301baf84e1dd46d5aeeb4986eb2 (diff) | |
iOS: Handle keyboard events when using an external keyboard
This enables the two possible approaches for handling external keyboard
events. While support still exists for before 13.4 then both approaches
are needed. This ensures that all external keyboard events are handled
as key events and passed on accordingly. Additionally, this accounts
for possible shortcuts too, therefore a new function is added to
QShortcutMap to aid that.
As a result, code has now moved from QCocoaKeyMapper to be part of the
gui/platforms/darwin part to make it easier to reuse this code
elsewhere.
Fixes: QTBUG-85727
Change-Id: I349af43468b03fd8dcb16adba02669974affe154
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoaintegration.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaintegration.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm index 872d9bb7f1..1ab30df7e8 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.mm +++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm @@ -136,7 +136,7 @@ QCocoaIntegration::QCocoaIntegration(const QStringList ¶mList) , mCocoaDrag(new QCocoaDrag) , mNativeInterface(new QCocoaNativeInterface) , mServices(new QCocoaServices) - , mKeyboardMapper(new QCocoaKeyMapper) + , mKeyboardMapper(new QAppleKeyMapper) { logVersionInformation(); @@ -420,7 +420,7 @@ QVariant QCocoaIntegration::styleHint(StyleHint hint) const Qt::KeyboardModifiers QCocoaIntegration::queryKeyboardModifiers() const { - return QCocoaKeyMapper::queryKeyboardModifiers(); + return QAppleKeyMapper::queryKeyboardModifiers(); } QList<int> QCocoaIntegration::possibleKeys(const QKeyEvent *event) const |