diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-09-08 10:58:45 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-09-08 11:28:50 +0200 |
| commit | 5b0536d64b83eac53c4cf479152f3d72d545beaa (patch) | |
| tree | bcf4eb628f5e6d4bd4c3e5ccb09eb17d4f0611fc /src/declarative/items | |
| parent | e4f546d5b0814066370a243aa22f0926a6668edc (diff) | |
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>
Diffstat (limited to 'src/declarative/items')
| -rw-r--r-- | src/declarative/items/qsgitem.cpp | 6 | ||||
| -rw-r--r-- | 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 2a5486b859..d3b3e0b9d4 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 9014cb1615..7a58698089 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(); |