diff options
| author | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-02 07:36:48 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-02 07:36:48 +0200 |
| commit | d6f58e5e17d58c640fc7779652008fda0d66f41d (patch) | |
| tree | d50d27e260c9eaf4bc2bcb4480b8a069a3aed857 /src/plugins/platforms/android/qandroidinputcontext.h | |
| parent | 83de197a57ff6c3e5bbad26bd871981285384fcb (diff) | |
| parent | 0ab63b035a649dc1982c867cd37d466d249004b9 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/platforms/android/qandroidinputcontext.h')
| -rw-r--r-- | src/plugins/platforms/android/qandroidinputcontext.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/platforms/android/qandroidinputcontext.h b/src/plugins/platforms/android/qandroidinputcontext.h index 2fb54a97c4..f7b29a855f 100644 --- a/src/plugins/platforms/android/qandroidinputcontext.h +++ b/src/plugins/platforms/android/qandroidinputcontext.h @@ -97,6 +97,8 @@ public: void clear(); //---------------// + jboolean beginBatchEdit(); + jboolean endBatchEdit(); jboolean commitText(const QString &text, jint newCursorPosition); jboolean deleteSurroundingText(jint leftLength, jint rightLength); jboolean finishComposingText(); @@ -133,6 +135,7 @@ private: QString m_composingText; QMetaObject::Connection m_updateCursorPosConnection; bool m_blockUpdateSelection; + int m_batchEditNestingLevel; }; QT_END_NAMESPACE |