From 49bb37e05d9b7047a80c93667d43657395bdec73 Mon Sep 17 00:00:00 2001
From: Joona Petrell <joona.t.petrell@nokia.com>
Date: Thu, 8 Sep 2011 12:06:19 +0300
Subject: Use new QInputPanel update function in QTextControl

Change-Id: I20f4aa4e469b507ddb40381e922dcf23f6a469b8
Reviewed-on: http://codereview.qt-project.org/4436
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
---
 src/gui/text/qtextcontrol.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp
index 5a86e843a3..2faa5e2078 100644
--- a/src/gui/text/qtextcontrol.cpp
+++ b/src/gui/text/qtextcontrol.cpp
@@ -52,6 +52,7 @@
 #include <qdrag.h>
 #include <qclipboard.h>
 #include <qtimer.h>
+#include <qinputpanel.h>
 #include "private/qtextdocumentlayout_p.h"
 #include "private/qabstracttextdocumentlayout_p.h"
 #include "qtextdocument.h"
@@ -1592,13 +1593,8 @@ void QTextControlPrivate::mouseMoveEvent(QEvent *e, Qt::MouseButton button, cons
         if (cursor.position() != oldCursorPos)
             emit q->cursorPositionChanged();
         _q_updateCurrentCharFormatAndSelection();
-#if 0 // ### ndef QT_NO_IM
-        if (contextObject) {
-            if (QInputContext *ic = inputContext()) {
-                ic->update();
-            }
-        }
-#endif //QT_NO_IM
+        if (qGuiApp)
+            qGuiApp->inputPanel()->update(Qt::ImQueryAll);
     } else {
         //emit q->visibilityRequest(QRectF(mousePos, QSizeF(1, 1)));
         if (cursor.position() != oldCursorPos) {
-- 
cgit v1.2.3