diff options
| author | Liang Qi <liang.qi@digia.com> | 2014-01-14 09:34:47 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-16 20:38:27 +0100 |
| commit | 2565ef220b9f261fc2d62869b8d38625e41bc6fd (patch) | |
| tree | ec799db29ee5a305a4fb3346cad9b2ab69dba619 /src/plugins/platforms/cocoa/qnsview.mm | |
| parent | 6cbbd1f93d369059e16c62f4b8ba60ad3407d886 (diff) | |
Revert "Cocoa: fix single punctuation input via CJK input method"
This change makes a regression.
This reverts commit a79f8a3a6774875fc16fd63461e04c2791a8d03d.
Task-number: QTBUG-36033
Change-Id: Ibcb19cd8631f85c81433c9625bbbf280404db1c4
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qnsview.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview.mm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm index f7b129aea1..ecb6c127aa 100644 --- a/src/plugins/platforms/cocoa/qnsview.mm +++ b/src/plugins/platforms/cocoa/qnsview.mm @@ -1346,6 +1346,11 @@ static QTabletEvent::TabletDevice wacomTabletDevice(NSEvent *theEvent) { Q_UNUSED(replacementRange) + if (m_sendKeyEvent && m_composingText.isEmpty()) { + // don't send input method events for simple text input (let handleKeyEvent send key events instead) + return; + } + QString commitString; if ([aString length]) { if ([aString isKindOfClass:[NSAttributedString class]]) { |