From 45d4e4b06cef17f4bd4a2a926299b8ccb0f2267f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Tue, 7 Jul 2020 21:05:53 +0200
Subject: [PATCH] macOS: Map Qt::KeyboardModifier to a single Carbon modifier

The modifier is passed to UCKeyTranslate, and we don't need to turn
e.g. Qt::ShiftModifier into both shiftKey and rightShiftKey. One is
enough to map the virtual key to a unicode character.

Change-Id: I33c46c016df03ecf17b5d87885d80a6d581767bc
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
---
 src/plugins/platforms/cocoa/qcocoakeymapper.mm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/plugins/platforms/cocoa/qcocoakeymapper.mm b/src/plugins/platforms/cocoa/qcocoakeymapper.mm
index 2cb2fd0255d..21e7573984f 100644
--- a/src/plugins/platforms/cocoa/qcocoakeymapper.mm
+++ b/src/plugins/platforms/cocoa/qcocoakeymapper.mm
@@ -92,12 +92,9 @@ static CarbonModifiers toCarbonModifiers(Qt::KeyboardModifiers qtModifiers)
 
     static constexpr std::tuple<int, Qt::KeyboardModifier> carbonModifierMap[] = {
         { shiftKey, Qt::ShiftModifier },
-        { rightShiftKey, Qt::ShiftModifier },
         { controlKey, Qt::ControlModifier },
-        { rightControlKey, Qt::ControlModifier },
         { cmdKey, Qt::MetaModifier },
         { optionKey, Qt::AltModifier },
-        { rightOptionKey, Qt::AltModifier },
         { kEventKeyModifierNumLockMask, Qt::KeypadModifier }
     };