AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Cocoa: fix single punctuation input via CJK input method"

Browse Source 
This change makes a regression.

This reverts commit a79f8a3a67.

Task-number: QTBUG-36033
Change-Id: Ibcb19cd8631f85c81433c9625bbbf280404db1c4
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
This commit is contained in:
Liang Qi 2014-01-14 09:34:47 +01:00 committed by The Qt Project
parent 6cbbd1f93d
commit 2565ef220b
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/platforms/cocoa/qnsview.mm
View File

@ -1346,6 +1346,11 @@ static QTabletEvent::TabletDevice wacomTabletDevice(NSEvent *theEvent)
{ {
Q_UNUSED(replacementRange) 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; QString commitString;
if ([aString length]) { if ([aString length]) {
if ([aString isKindOfClass:[NSAttributedString class]]) { if ([aString isKindOfClass:[NSAttributedString class]]) {