diff options
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/platform/darwin/qapplekeymapper.mm | 6 | ||||
-rw-r--r-- | src/gui/platform/darwin/qapplekeymapper_p.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/gui/platform/darwin/qapplekeymapper.mm b/src/gui/platform/darwin/qapplekeymapper.mm index 19e34b1698..738fab3863 100644 --- a/src/gui/platform/darwin/qapplekeymapper.mm +++ b/src/gui/platform/darwin/qapplekeymapper.mm @@ -74,7 +74,7 @@ static Qt::KeyboardModifiers swapModifiersIfNeeded(const Qt::KeyboardModifiers m } Qt::Key QAppleKeyMapper::fromNSString(Qt::KeyboardModifiers qtModifiers, NSString *characters, - NSString *charactersIgnoringModifiers) + NSString *charactersIgnoringModifiers, QString &text) { if ([characters isEqualToString:@"\t"]) { if (qtModifiers & Qt::ShiftModifier) @@ -93,6 +93,10 @@ Qt::Key QAppleKeyMapper::fromNSString(Qt::KeyboardModifiers qtModifiers, NSStrin } else if ([characters length] != 0) { ch = QChar([characters characterAtIndex:0]); } + if (!(qtModifiers & (Qt::ControlModifier | Qt::MetaModifier)) && + (ch.unicode() < 0xf700 || ch.unicode() > 0xf8ff)) { + text = QString::fromNSString(characters); + } if (!ch.isNull()) return Qt::Key(ch.toUpper().unicode()); } diff --git a/src/gui/platform/darwin/qapplekeymapper_p.h b/src/gui/platform/darwin/qapplekeymapper_p.h index dd15e37ae6..78e71ac37d 100644 --- a/src/gui/platform/darwin/qapplekeymapper_p.h +++ b/src/gui/platform/darwin/qapplekeymapper_p.h @@ -68,7 +68,7 @@ public: static Qt::KeyboardModifiers queryKeyboardModifiers(); QList<int> possibleKeys(const QKeyEvent *event) const; static Qt::Key fromNSString(Qt::KeyboardModifiers qtMods, NSString *characters, - NSString *charactersIgnoringModifiers); + NSString *charactersIgnoringModifiers, QString &text); #ifdef Q_OS_MACOS static Qt::KeyboardModifiers fromCocoaModifiers(NSEventModifierFlags cocoaModifiers); static NSEventModifierFlags toCocoaModifiers(Qt::KeyboardModifiers); |