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>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/widgets/widgets/qscrollarea.cpp b/src/widgets/widgets/qscrollarea.cpp
index 314f4fe9d2..5d03c07472 100644
--- a/src/widgets/widgets/qscrollarea.cpp
+++ b/src/widgets/widgets/qscrollarea.cpp
@@ -465,9 +465,9 @@ void QScrollArea::ensureWidgetVisible(QWidget *childWidget, int xmargin, int yma
     if (!d->widget->isAncestorOf(childWidget))
         return;
 
-    const QRect microFocus = childWidget->inputMethodQuery(Qt::ImMicroFocus).toRect();
+    const QRect microFocus = childWidget->inputMethodQuery(Qt::ImCursorRectangle).toRect();
     const QRect defaultMicroFocus =
-        childWidget->QWidget::inputMethodQuery(Qt::ImMicroFocus).toRect();
+        childWidget->QWidget::inputMethodQuery(Qt::ImCursorRectangle).toRect();
     QRect focusRect = (microFocus != defaultMicroFocus)
         ? QRect(childWidget->mapTo(d->widget, microFocus.topLeft()), microFocus.size())
         : QRect(childWidget->mapTo(d->widget, QPoint(0,0)), childWidget->size());