From 2565ef220b9f261fc2d62869b8d38625e41bc6fd Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@digia.com>
Date: Tue, 14 Jan 2014 09:34:47 +0100
Subject: 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>
---
 src/plugins/platforms/cocoa/qnsview.mm | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src')

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]]) {
-- 
cgit v1.2.3