Rename ImMicroFocus to ImCursorrRctangle

Also set ImhMultiLine on the TextEdit

Change-Id: I563fef803660e35f39cdf1b40526356bfc0581e0
Reviewed-on: http://codereview.qt-project.org/4415
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

diff --git a/src/declarative/items/qsgitem.cpp b/src/declarative/items/qsgitem.cpp
index 2a5486b..d3b3e0b 100644 (file)
--- a/src/declarative/items/qsgitem.cpp
+++ b/src/declarative/items/qsgitem.cpp
@@ -2200,7 +2200,7 @@ QSGItemPrivate::QSGItemPrivate()
   z(0), scale(1), rotation(0), opacity(1),
 
   attachedLayoutDirection(0), acceptedMouseButtons(0),
-  imHints(Qt::ImhNone),
+  imHints(Qt::ImhMultiLine),
 
   keyHandler(0),
 
@@ -2937,7 +2937,7 @@ void QSGItem::updateMicroFocus()
 {
     QInputPanel *p = qApp->inputPanel();
     if (p->inputItem() == this)
-        qApp->inputPanel()->update(Qt::ImMicroFocus);
+        qApp->inputPanel()->update(Qt::ImCursorRectangle);
 }
 
 QVariant QSGItem::inputMethodQuery(Qt::InputMethodQuery query) const
@@ -2952,7 +2952,7 @@ QVariant QSGItem::inputMethodQuery(Qt::InputMethodQuery query) const
     case Qt::ImHints:
         v = (int)inputMethodHints();
         break;
-    case Qt::ImMicroFocus:
+    case Qt::ImCursorRectangle:
     case Qt::ImFont:
     case Qt::ImCursorPosition:
     case Qt::ImSurroundingText:

diff --git a/src/declarative/items/qsgtextinput.cpp b/src/declarative/items/qsgtextinput.cpp
index 9014cb1..7a58698 100644 (file)
--- a/src/declarative/items/qsgtextinput.cpp
+++ b/src/declarative/items/qsgtextinput.cpp
@@ -1353,7 +1353,7 @@ QVariant QSGTextInput::inputMethodQuery(Qt::InputMethodQuery property) const
         return QVariant((bool)(flags() & ItemAcceptsInputMethod));
     case Qt::ImHints:
         return QVariant((int)inputMethodHints());
-    case Qt::ImMicroFocus:
+    case Qt::ImCursorRectangle:
         return cursorRectangle();
     case Qt::ImFont:
         return font();