From 9dfebdb6c51aa217ae83bb2bae09bd6411a2079f Mon Sep 17 00:00:00 2001
From: Pekka Vuorela <pekka.ta.vuorela@nokia.com>
Date: Fri, 9 Dec 2011 15:30:26 +0200
Subject: [PATCH] Protect QTextControl::setTextCursor for existing preedit

Change-Id: I29fc7c472a3a20eeaf74e0dc411313e5750e9dee
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
---
 src/quick/items/qquicktextcontrol.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/quick/items/qquicktextcontrol.cpp b/src/quick/items/qquicktextcontrol.cpp
index 436b6b7..8133087 100644
--- a/src/quick/items/qquicktextcontrol.cpp
+++ b/src/quick/items/qquicktextcontrol.cpp
@@ -827,6 +827,7 @@ QTextDocument *QQuickTextControl::document() const
 void QQuickTextControl::setTextCursor(const QTextCursor &cursor)
 {
     Q_D(QQuickTextControl);
+    d->commitPreedit();
     d->cursorIsFocusIndicator = false;
     const bool posChanged = cursor.position() != d->cursor.position();
     const QTextCursor oldSelection = d->cursor;
-- 
2.7.4