diff options
author | Joona Petrell <joona.t.petrell@nokia.com> | 2011-09-07 23:19:14 +0300 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2011-09-08 10:34:45 +0200 |
commit | e4f546d5b0814066370a243aa22f0926a6668edc (patch) | |
tree | ed1623f0ca3124cd2d0a832b9849d674d40b37a1 /src | |
parent | b11d3919936e710162c9ffa405152b8499111b1b (diff) |
Handle ImEnabled and ImHints input method queries in QSGTextInput and QSGTextEdit
Change-Id: I348f924f2987f1c163c89ce4eef18fe864ec665d
Reviewed-on: http://codereview.qt-project.org/4407
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/declarative/items/qsgtextedit.cpp | 16 | ||||
-rw-r--r-- | src/declarative/items/qsgtextinput.cpp | 4 |
2 files changed, 19 insertions, 1 deletions
diff --git a/src/declarative/items/qsgtextedit.cpp b/src/declarative/items/qsgtextedit.cpp index 1f1de8ed49..74f3450952 100644 --- a/src/declarative/items/qsgtextedit.cpp +++ b/src/declarative/items/qsgtextedit.cpp @@ -1424,7 +1424,21 @@ Returns the value of the given \a property. QVariant QSGTextEdit::inputMethodQuery(Qt::InputMethodQuery property) const { Q_D(const QSGTextEdit); - return d->control->inputMethodQuery(property); + + QVariant v; + switch (property) { + case Qt::ImEnabled: + v = (bool)(flags() & ItemAcceptsInputMethod); + break; + case Qt::ImHints: + v = (int)inputMethodHints(); + break; + default: + v = d->control->inputMethodQuery(property); + break; + } + return v; + } void QSGTextEdit::updateImageCache(const QRectF &) diff --git a/src/declarative/items/qsgtextinput.cpp b/src/declarative/items/qsgtextinput.cpp index 9974094e5b..9014cb1615 100644 --- a/src/declarative/items/qsgtextinput.cpp +++ b/src/declarative/items/qsgtextinput.cpp @@ -1349,6 +1349,10 @@ QVariant QSGTextInput::inputMethodQuery(Qt::InputMethodQuery property) const { Q_D(const QSGTextInput); switch(property) { + case Qt::ImEnabled: + return QVariant((bool)(flags() & ItemAcceptsInputMethod)); + case Qt::ImHints: + return QVariant((int)inputMethodHints()); case Qt::ImMicroFocus: return cursorRectangle(); case Qt::ImFont: |