diff options
| author | Paul Olav Tvete <paul.tvete@digia.com> | 2014-09-22 14:22:53 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@digia.com> | 2014-10-10 10:04:42 +0200 |
| commit | c712ec4543bb9a3db469ffd909e01d97c48ff697 (patch) | |
| tree | 8f5533fe468520450b6878c20c4713c119610386 /src/plugins/platforms/android | |
| parent | 7755b4af417e6b6da3dac0617eb2ce3a37b9a53c (diff) | |
Android: Thread fix/optimization
Do the cheap test before sending an expensive query that might
use a mutex.
Task-number: QTBUG-41369
Change-Id: I78f03c84e5bbf0492f1b7ea18d1baa752a1beff2
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Diffstat (limited to 'src/plugins/platforms/android')
| -rw-r--r-- | src/plugins/platforms/android/qandroidinputcontext.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/android/qandroidinputcontext.cpp b/src/plugins/platforms/android/qandroidinputcontext.cpp index a23d05520c..ca9d1e69c9 100644 --- a/src/plugins/platforms/android/qandroidinputcontext.cpp +++ b/src/plugins/platforms/android/qandroidinputcontext.cpp @@ -642,13 +642,13 @@ jboolean QAndroidInputContext::deleteSurroundingText(jint leftLength, jint right // Android docs say the cursor must not move jboolean QAndroidInputContext::finishComposingText() { + if (m_composingText.isEmpty()) + return JNI_TRUE; // not composing + QSharedPointer<QInputMethodQueryEvent> query = focusObjectInputMethodQueryThreadSafe(); if (query.isNull()) return JNI_FALSE; - if (m_composingText.isEmpty()) - return JNI_TRUE; // not composing - const int blockPos = getBlockPosition(query); const int localCursorPos = m_composingCursor - blockPos; |