diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-09 17:06:13 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-10 12:17:03 +0200 |
| commit | f08c15c3de5fd3fde2281dc00db1aecb1fea52f7 (patch) | |
| tree | be11c86d6fe7e75405beab457a37b14adb7df669 /src/plugins/platforms/cocoa | |
| parent | 3dedb5292d7c906c43e86bfb9ff3373301ff8188 (diff) | |
macOS: Simplify dead key handling
Change-Id: Ie2e2c6e1b1daf08146fd42f3ce58194ee1918794
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa')
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview_keys.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview_keys.mm b/src/plugins/platforms/cocoa/qnsview_keys.mm index 0122c01972..37c46204e1 100644 --- a/src/plugins/platforms/cocoa/qnsview_keys.mm +++ b/src/plugins/platforms/cocoa/qnsview_keys.mm @@ -68,8 +68,8 @@ // ALT+E to be used as a shortcut with an English keyboard even though // pressing ALT+E will give a dead key while doing normal text input. if ([characters length] != 0 || [charactersIgnoringModifiers length] != 0) { - auto ctrlOrMetaModifier = qApp->testAttribute(Qt::AA_MacDontSwapCtrlAndMeta) ? Qt::ControlModifier : Qt::MetaModifier; - if (((modifiers & ctrlOrMetaModifier) || (modifiers & Qt::AltModifier)) && ([charactersIgnoringModifiers length] != 0)) + if (nativeModifiers & (NSEventModifierFlagControl | NSEventModifierFlagOption) + && [charactersIgnoringModifiers length] != 0) ch = QChar([charactersIgnoringModifiers characterAtIndex:0]); else if ([characters length] != 0) ch = QChar([characters characterAtIndex:0]); |