diff options
| author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2011-09-07 20:57:00 +0300 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-09-08 10:32:15 +0200 |
| commit | 6d9d1e78f442b7480ae764d292099c34cb727ca5 (patch) | |
| tree | 9dfc197ed1e1960d31da6362d77cd516cd0ecc4c /src | |
| parent | 53d549fe7689ab65e133b085bf70f713f3436571 (diff) | |
Added QInputPanel::commit()
To be called when input context is expected to commit what it had as
preedit, and resetting its state. Earlier this was done with ::reset()
when in fact documentation somewhat disallowed doing so.
Change-Id: I10ad0620aa42fce6d01a69265af8a4f5f9f4d397
Reviewed-on: http://codereview.qt-project.org/4401
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qinputpanel.cpp | 7 | ||||
| -rw-r--r-- | src/gui/kernel/qinputpanel.h | 1 | ||||
| -rw-r--r-- | src/gui/kernel/qplatforminputcontext_qpa.cpp | 4 | ||||
| -rw-r--r-- | src/gui/kernel/qplatforminputcontext_qpa.h | 1 |
4 files changed, 13 insertions, 0 deletions
diff --git a/src/gui/kernel/qinputpanel.cpp b/src/gui/kernel/qinputpanel.cpp index a11a5d47a64..5219adecf13 100644 --- a/src/gui/kernel/qinputpanel.cpp +++ b/src/gui/kernel/qinputpanel.cpp @@ -162,6 +162,13 @@ void QInputPanel::reset() ic->reset(); } +void QInputPanel::commit() +{ + QPlatformInputContext *ic = QGuiApplicationPrivate::platformIntegration()->inputContext(); + if (ic) + ic->commit(); +} + void QInputPanel::invokeAction(Action a, int cursorPosition) { QPlatformInputContext *ic = QGuiApplicationPrivate::platformIntegration()->inputContext(); diff --git a/src/gui/kernel/qinputpanel.h b/src/gui/kernel/qinputpanel.h index b0f0e2387ba..c16a18eea9e 100644 --- a/src/gui/kernel/qinputpanel.h +++ b/src/gui/kernel/qinputpanel.h @@ -97,6 +97,7 @@ public Q_SLOTS: void update(Qt::InputMethodQueries queries); void reset(); + void commit(); void invokeAction(Action a, int cursorPosition); diff --git a/src/gui/kernel/qplatforminputcontext_qpa.cpp b/src/gui/kernel/qplatforminputcontext_qpa.cpp index 32800833abf..328d4f5b745 100644 --- a/src/gui/kernel/qplatforminputcontext_qpa.cpp +++ b/src/gui/kernel/qplatforminputcontext_qpa.cpp @@ -56,6 +56,10 @@ void QPlatformInputContext::reset() { } +void QPlatformInputContext::commit() +{ +} + void QPlatformInputContext::update(Qt::InputMethodQueries) { } diff --git a/src/gui/kernel/qplatforminputcontext_qpa.h b/src/gui/kernel/qplatforminputcontext_qpa.h index 3bdce730197..1720e634c72 100644 --- a/src/gui/kernel/qplatforminputcontext_qpa.h +++ b/src/gui/kernel/qplatforminputcontext_qpa.h @@ -60,6 +60,7 @@ public: virtual ~QPlatformInputContext(); virtual void reset(); + virtual void commit(); virtual void update(Qt::InputMethodQueries); virtual void invokeAction(QInputPanel::Action, int cursorPosition); |