diff options
| author | Paul Olav Tvete <paul.tvete@digia.com> | 2014-05-07 15:02:29 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-08 13:27:37 +0200 |
| commit | 50eaeab378ebef60305d47b2b0f2f5eb39641338 (patch) | |
| tree | d7dab58fec80e633fb65b5796afa9ec5fdb5dfd2 /src/quick | |
| parent | 556846aa1fd5594156116c33ebf57b1f58fff53e (diff) | |
Android: Add support for new input method query API
Change 93fd268d implemented the new API, but missed the final
piece that actually made use of it.
Task-number: QTBUG-38824
Change-Id: Iea28f2cbb8c6d749d781dcf7437552597977f9ac
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/items/qquicktextedit.cpp | 14 | ||||
| -rw-r--r-- | src/quick/items/qquicktextedit_p.h | 1 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index 3c4d0d4b42..5280301675 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -1709,9 +1709,9 @@ void QQuickTextEdit::inputMethodEvent(QInputMethodEvent *event) /*! \overload -Returns the value of the given \a property. +Returns the value of the given \a property and \a argument. */ -QVariant QQuickTextEdit::inputMethodQuery(Qt::InputMethodQuery property) const +QVariant QQuickTextEdit::inputMethodQuery(Qt::InputMethodQuery property, QVariant argument) const { Q_D(const QQuickTextEdit); @@ -1724,11 +1724,19 @@ QVariant QQuickTextEdit::inputMethodQuery(Qt::InputMethodQuery property) const v = (int)d->effectiveInputMethodHints(); break; default: - v = d->control->inputMethodQuery(property); + v = d->control->inputMethodQuery(property, argument); break; } return v; +} +/*! +\overload +Returns the value of the given \a property. +*/ +QVariant QQuickTextEdit::inputMethodQuery(Qt::InputMethodQuery property) const +{ + return inputMethodQuery(property, QVariant()); } #endif // QT_NO_IM diff --git a/src/quick/items/qquicktextedit_p.h b/src/quick/items/qquicktextedit_p.h index c6b7ce3699..614effd4c9 100644 --- a/src/quick/items/qquicktextedit_p.h +++ b/src/quick/items/qquicktextedit_p.h @@ -229,6 +229,7 @@ public: #ifndef QT_NO_IM QVariant inputMethodQuery(Qt::InputMethodQuery property) const; + Q_INVOKABLE QVariant inputMethodQuery(Qt::InputMethodQuery query, QVariant argument) const; #endif qreal contentWidth() const; |