diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2011-09-08 12:06:19 +0300 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-09-08 13:39:43 +0200 |
| commit | 49bb37e05d9b7047a80c93667d43657395bdec73 (patch) | |
| tree | 812182a368663b8a16cd989160d767369c13033a | |
| parent | 9abb38f5a693dfc30842c5c1aa012ab5d72e0d16 (diff) | |
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>
| -rw-r--r-- | src/gui/text/qtextcontrol.cpp | 10 |
1 files 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) { |