diff options
| author | Liang Qi <liang.qi@digia.com> | 2014-06-03 09:26:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@digia.com> | 2014-06-21 15:22:15 +0200 |
| commit | ebc729b3c3493f2da9c00eb4ab53ca56f6042c87 (patch) | |
| tree | 38c33c3b977d122e8f7d3c3728d144218aa4cd6d | |
| parent | fbac55fe59db8f16fbe94f79677f53fc47adc6a2 (diff) | |
Cocoa: fix Option + any key in key event
Unmodified key code should be used.
Task-number: QTBUG-33200
Change-Id: I9cf91030e80336772c05a40efae52f3b8734cbdb
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm index 24a9f6fff0..a2047bf550 100644 --- a/src/plugins/platforms/cocoa/qnsview.mm +++ b/src/plugins/platforms/cocoa/qnsview.mm @@ -1316,7 +1316,7 @@ static QTabletEvent::TabletDevice wacomTabletDevice(NSEvent *theEvent) QChar ch = QChar::ReplacementCharacter; int keyCode = Qt::Key_unknown; if ([characters length] != 0) { - if ((modifiers & Qt::MetaModifier) && ([charactersIgnoringModifiers length] != 0)) + if (((modifiers & Qt::MetaModifier) || (modifiers & Qt::AltModifier)) && ([charactersIgnoringModifiers length] != 0)) ch = QChar([charactersIgnoringModifiers characterAtIndex:0]); else ch = QChar([characters characterAtIndex:0]); |