From 137ba2aba858bc32350e82ef6a1da91266c7f432 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Sun, 24 Oct 2021 11:29:19 +0200 Subject: 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 Reviewed-by: Richard Moe Gustavsen Reviewed-by: Eike Ziller --- src/plugins/platforms/cocoa/qnsview_keys.mm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/plugins/platforms') 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 -- cgit v1.2.3