diff options
author | Liang Qi <liang.qi@digia.com> | 2013-12-17 10:47:12 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-03 13:00:18 +0100 |
commit | a79f8a3a6774875fc16fd63461e04c2791a8d03d (patch) | |
tree | 0bdf3122f91f8b3ae2487d9d580af8a219ed74f1 /src | |
parent | 56ddf858f396038d8df0e25bdc3726e8d6886387 (diff) |
Cocoa: fix single punctuation input via CJK input method
2d05d3bd2815c220474b3c07bf3f2ef7417d3070 was not correct.
On OS X, when user uses CJK input method, only types single punctuation,
it was converted to CJK ones, and not showed in composing text.
Task-number: QTBUG-35700
Change-Id: I919edb3f5165bf943c0d90d06a788a2f335bb1ba
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/platforms/cocoa/qnsview.mm | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm index 1c15c3b561..e183f93c6c 100644 --- a/src/plugins/platforms/cocoa/qnsview.mm +++ b/src/plugins/platforms/cocoa/qnsview.mm @@ -1342,11 +1342,6 @@ 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]]) { |