2 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/platform/darwin/qapplekeymapper.mm b/src/gui/platform/darwin/qapplekeymapper.mm
index 29fdae8d7f..c2a2ba7ed6 100644
--- a/src/gui/platform/darwin/qapplekeymapper.mm
+++ b/src/gui/platform/darwin/qapplekeymapper.mm
@@ -437,7 +437,6 @@ bool QAppleKeyMapper::updateKeyboard()
     Q_ASSERT(source);
     m_currentInputSource = source;
     m_keyboardKind = LMGetKbdType();
-    m_deadKeyState = 0;
 
     m_keyMap.clear();
 
@@ -508,12 +507,15 @@ const QAppleKeyMapper::KeyMap &QAppleKeyMapper::keyMapForKey(VirtualKeyCode virt
         auto carbonModifiers = toCarbonModifiers(qtModifiers);
         const UInt32 modifierKeyState = (carbonModifiers >> 8) & 0xFF;
 
+        UInt32 deadKeyState = 0;
         static const UniCharCount maxStringLength = 10;
         static UniChar unicodeString[maxStringLength];
         UniCharCount actualStringLength = 0;
         OSStatus err = UCKeyTranslate(m_keyboardLayoutFormat, virtualKey,
-            kUCKeyActionDown, modifierKeyState, m_keyboardKind, OptionBits(0),
-            &m_deadKeyState, maxStringLength, &actualStringLength, unicodeString);
+            kUCKeyActionDown, modifierKeyState, m_keyboardKind,
+            kUCKeyTranslateNoDeadKeysMask, &deadKeyState,
+            maxStringLength, &actualStringLength,
+            unicodeString);
 
         // Use translated Unicode key if valid
         QChar carbonUnicodeKey;
diff --git a/src/gui/platform/darwin/qapplekeymapper_p.h b/src/gui/platform/darwin/qapplekeymapper_p.h
index 78e71ac37d..9b2b661b7b 100644
--- a/src/gui/platform/darwin/qapplekeymapper_p.h
+++ b/src/gui/platform/darwin/qapplekeymapper_p.h
@@ -102,7 +102,6 @@ private:
     enum { NullMode, UnicodeMode, OtherMode } m_keyboardMode = NullMode;
     const UCKeyboardLayout *m_keyboardLayoutFormat = nullptr;
     KeyboardLayoutKind m_keyboardKind = kKLKCHRuchrKind;
-    mutable UInt32 m_deadKeyState = 0; // Maintains dead key state beween calls to UCKeyTranslate
 
     mutable QHash<VirtualKeyCode, KeyMap> m_keyMap;
 #endif