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>

diff --git a/src/gui/kernel/qinputpanel.cpp b/src/gui/kernel/qinputpanel.cpp
index a11a5d4..5219ade 100644 (file)
--- 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 b0f0e23..c16a18e 100644 (file)
--- 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 3280083..328d4f5 100644 (file)
--- 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 3bdce73..1720e63 100644 (file)
--- 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);