From b21083353a224d1a183f28b970abc8be56649da1 Mon Sep 17 00:00:00 2001
From: Peter Varga <pvarga@inf.u-szeged.hu>
Date: Mon, 19 Dec 2016 17:36:50 +0100
Subject: Fix handling of empty input method events

Task-number: QTBUG-55766
Change-Id: I4e6ade8f000f66ff1bb28f3b856ae140834292f1
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/core/render_widget_host_view_qt.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/core/render_widget_host_view_qt.cpp')

diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index 0a41d67ae..813bbe0d7 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -1114,7 +1114,10 @@ void RenderWidgetHostViewQt::handleInputMethodEvent(QInputMethodEvent *ev)
             QGuiApplication::postEvent(qApp->focusObject(), eventCopy);
         } else {
             m_receivedEmptyImeText = false;
-            m_host->ImeCancelComposition();
+            if (m_imeInProgress) {
+                m_imeInProgress = false;
+                m_host->ImeCancelComposition();
+            }
         }
     }
 }
-- 
cgit v1.2.3