2 files changed, 10 insertions, 11 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoamenuitem.mm b/src/plugins/platforms/cocoa/qcocoamenuitem.mm
index 39a124ea44..511c72988a 100644
--- a/src/plugins/platforms/cocoa/qcocoamenuitem.mm
+++ b/src/plugins/platforms/cocoa/qcocoamenuitem.mm
@@ -353,9 +353,8 @@ NSMenuItem *QCocoaMenuItem::sync()
 
 #ifndef QT_NO_SHORTCUT
     if (accel.count() == 1) {
-        auto shortcut = accel[0];
-        auto key = Qt::Key(shortcut & ~Qt::KeyboardModifierMask);
-        auto modifiers = Qt::KeyboardModifiers(shortcut & Qt::KeyboardModifierMask);
+        auto key = accel[0].key();
+        auto modifiers = accel[0].keyboardModifiers();
 
         QChar cocoaKey = QCocoaKeyMapper::toCocoaKey(key);
         if (cocoaKey.isNull())
diff --git a/src/plugins/platforms/cocoa/qcocoatheme.mm b/src/plugins/platforms/cocoa/qcocoatheme.mm
index 2e305ffb3d..af4c1550e7 100644
--- a/src/plugins/platforms/cocoa/qcocoatheme.mm
+++ b/src/plugins/platforms/cocoa/qcocoatheme.mm
@@ -575,14 +575,14 @@ QList<QKeySequence> QCocoaTheme::keyBindings(QKeySequence::StandardKey key) cons
     auto bindings = QPlatformTheme::keyBindings(key);
 
     if (qApp->testAttribute(Qt::AA_MacDontSwapCtrlAndMeta)) {
-        static auto swapCtrlMeta = [](int keySequence) {
-            auto originalKeySequence = keySequence;
-            keySequence &= ~(Qt::ControlModifier | Qt::MetaModifier);
-            if (originalKeySequence & Qt::ControlModifier)
-                keySequence |= Qt::MetaModifier;
-            if (originalKeySequence & Qt::MetaModifier)
-                keySequence |= Qt::ControlModifier;
-            return keySequence;
+        static auto swapCtrlMeta = [](QKeyCombination keyCombination) {
+            const auto originalKeyModifiers = keyCombination.keyboardModifiers();
+            auto newKeyboardModifiers = originalKeyModifiers & ~(Qt::ControlModifier | Qt::MetaModifier);
+            if (originalKeyModifiers & Qt::ControlModifier)
+                newKeyboardModifiers |= Qt::MetaModifier;
+            if (originalKeyModifiers & Qt::MetaModifier)
+                newKeyboardModifiers |= Qt::ControlModifier;
+            return QKeyCombination(newKeyboardModifiers, keyCombination.key());
         };
 
         QList<QKeySequence> swappedBindings;