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>

6 files changed, 8 insertions, 7 deletions

diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp
index 75e2921896..d6fbb7c953 100644
--- a/src/widgets/itemviews/qabstractitemview.cpp
+++ b/src/widgets/itemviews/qabstractitemview.cpp
@@ -863,7 +863,7 @@ QAbstractItemDelegate *QAbstractItemView::itemDelegate() const
 QVariant QAbstractItemView::inputMethodQuery(Qt::InputMethodQuery query) const
 {
     const QModelIndex current = currentIndex();
-    if (!current.isValid() || query != Qt::ImMicroFocus)
+    if (!current.isValid() || query != Qt::ImCursorRectangle)
         return QAbstractScrollArea::inputMethodQuery(query);
     return visualRect(current);
 }
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index 0cecce8cfb..125e33f0da 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -8338,7 +8338,7 @@ bool QWidget::event(QEvent *event)
         if (!k->isAccepted()
             && k->modifiers() & Qt::ShiftModifier && k->key() == Qt::Key_F1
             && d->whatsThis.size()) {
-            QWhatsThis::showText(mapToGlobal(inputMethodQuery(Qt::ImMicroFocus).toRect().center()), d->whatsThis, this);
+            QWhatsThis::showText(mapToGlobal(inputMethodQuery(Qt::ImCursorRectangle).toRect().center()), d->whatsThis, this);
             k->accept();
         }
 #endif
@@ -9280,7 +9280,7 @@ void QWidget::inputMethodEvent(QInputMethodEvent *event)
 QVariant QWidget::inputMethodQuery(Qt::InputMethodQuery query) const
 {
     switch(query) {
-    case Qt::ImMicroFocus:
+    case Qt::ImCursorRectangle:
         return QRect(width()/2, 0, 1, height());
     case Qt::ImFont:
         return font();
diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp
index 1ca3886fc5..aca15f30ed 100644
--- a/src/widgets/widgets/qlineedit.cpp
+++ b/src/widgets/widgets/qlineedit.cpp
@@ -1757,7 +1757,7 @@ QVariant QLineEdit::inputMethodQuery(Qt::InputMethodQuery property) const
 {
     Q_D(const QLineEdit);
     switch(property) {
-    case Qt::ImMicroFocus:
+    case Qt::ImCursorRectangle:
         return d->cursorRect();
     case Qt::ImFont:
         return font();
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());
diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp
index 72cb326507..67be9dbed3 100644
--- a/src/widgets/widgets/qtextedit.cpp
+++ b/src/widgets/widgets/qtextedit.cpp
@@ -181,6 +181,7 @@ void QTextEditPrivate::init(const QString &html)
     q->setFocusPolicy(Qt::WheelFocus);
     q->setAttribute(Qt::WA_KeyCompression);
     q->setAttribute(Qt::WA_InputMethodEnabled);
+    q->setInputMethodHints(Qt::ImhMultiLine);
 
 #ifndef QT_NO_CURSOR
     viewport->setCursor(Qt::IBeamCursor);
diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp
index 89c64082a4..43ebb6b078 100644
--- a/src/widgets/widgets/qwidgettextcontrol.cpp
+++ b/src/widgets/widgets/qwidgettextcontrol.cpp
@@ -1983,7 +1983,7 @@ QVariant QWidgetTextControl::inputMethodQuery(Qt::InputMethodQuery property) con
     Q_D(const QWidgetTextControl);
     QTextBlock block = d->cursor.block();
     switch(property) {
-    case Qt::ImMicroFocus:
+    case Qt::ImCursorRectangle:
         return cursorRect();
     case Qt::ImFont:
         return QVariant(d->cursor.charFormat().font());