From 5b0536d64b83eac53c4cf479152f3d72d545beaa Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 8 Sep 2011 10:58:45 +0200 Subject: [PATCH] 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 Reviewed-by: Lars Knoll --- src/declarative/items/qsgitem.cpp | 6 +++--- src/declarative/items/qsgtextinput.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/declarative/items/qsgitem.cpp b/src/declarative/items/qsgitem.cpp index 2a5486b..d3b3e0b 100644 --- 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 --- 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(); -- 1.7.2.5