summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2011-09-08 10:57:54 +0200
committerLars Knoll <lars.knoll@nokia.com>2011-09-08 11:28:38 +0200
commit6f65a55fa9a5bf8a547dff2893d49ab405a16af0 (patch)
tree971efee66ddcb83afd0f664a6dfa4747436619de /src/gui/kernel
parent1b1831500142c995137f5e4b1bc03d21aa08e1e1 (diff)
Rename ImMicroFocus to ImCursorRectangle
Also set ImhMultiLine on QTextEdit Change-Id: I04a5a1d69c2048ea94c24210e2b8374f334be1b6 Reviewed-on: http://codereview.qt-project.org/4414 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qinputpanel.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qinputpanel.cpp b/src/gui/kernel/qinputpanel.cpp
index 24300018f6..eda93e005c 100644
--- a/src/gui/kernel/qinputpanel.cpp
+++ b/src/gui/kernel/qinputpanel.cpp
@@ -99,7 +99,7 @@ QRectF QInputPanel::cursorRectangle() const
if (!d->inputItem)
return QRectF();
- QInputMethodQueryEvent query(Qt::ImMicroFocus);
+ QInputMethodQueryEvent query(Qt::ImCursorRectangle);
QGuiApplication::sendEvent(d->inputItem.data(), &query);
QRect r = query.value().toRect();
if (!r.isValid())
@@ -163,7 +163,7 @@ void QInputPanel::update(Qt::InputMethodQueries queries)
if (ic)
ic->update(queries);
- if (queries & Qt::ImMicroFocus)
+ if (queries & Qt::ImCursorRectangle)
emit cursorRectangleChanged();
}