diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-10-24 11:29:19 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-10-25 14:07:00 +0200 |
| commit | 137ba2aba858bc32350e82ef6a1da91266c7f432 (patch) | |
| tree | 0ede866ac5221f031e403a770bf4a56d36238ef3 /src/plugins/platforms | |
| parent | 1a44090df533de10d456f82bcbac61dd5ae66831 (diff) | |
Initialize member variables before we check their values
Amends 51679efcf97dfea86431912eeb9489088c0804ed, which broke Ctrl+key
handling so that the key was not translated based on the alphanumerical
character anymore.
Fixes: QTBUG-97713
Pick-to: 6.2
Change-Id: I9835fd7af99693aae636ba3c4c114ef8e11621e9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview_keys.mm | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview_keys.mm b/src/plugins/platforms/cocoa/qnsview_keys.mm index 96ab7ab168..9acd5cd14a 100644 --- a/src/plugins/platforms/cocoa/qnsview_keys.mm +++ b/src/plugins/platforms/cocoa/qnsview_keys.mm @@ -234,6 +234,9 @@ KeyEvent::KeyEvent(NSEvent *nsevent) { timestamp = nsevent.timestamp * 1000; + nativeModifiers = nsevent.modifierFlags; + nativeVirtualKey = nsevent.keyCode; + modifiers = QAppleKeyMapper::fromCocoaModifiers(nativeModifiers); switch (nsevent.type) { case NSEventTypeKeyDown: type = QEvent::KeyPress; break; @@ -269,11 +272,6 @@ KeyEvent::KeyEvent(NSEvent *nsevent) isRepeat = nsevent.ARepeat; } - - nativeVirtualKey = nsevent.keyCode; - - nativeModifiers = nsevent.modifierFlags; - modifiers = QAppleKeyMapper::fromCocoaModifiers(nativeModifiers); } bool KeyEvent::sendWindowSystemEvent(QWindow *window) const |