diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-29 14:17:21 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-05-29 14:17:21 +0000 |
| commit | 0c5fbd397ceda4d9f0046f1204b5e49229d04312 (patch) | |
| tree | 42a6113cad49eaff6b23664a4ac631a217d983c5 /src/plugins | |
| parent | 386aca1ba4da3383cd6b6253a7240417ff2d91a0 (diff) | |
| parent | 2670bdeee4b610be719caed841882babe7541ec9 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4.2' into 5.4" into refs/staging/5.4
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/android/qandroidinputcontext.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/android/qandroidinputcontext.cpp b/src/plugins/platforms/android/qandroidinputcontext.cpp index 7e81735de9..7264f9a74c 100644 --- a/src/plugins/platforms/android/qandroidinputcontext.cpp +++ b/src/plugins/platforms/android/qandroidinputcontext.cpp @@ -176,6 +176,8 @@ static jstring getSelectedText(JNIEnv *env, jobject /*thiz*/, jint flags) #ifdef QT_DEBUG_ANDROID_IM_PROTOCOL qDebug() << "@@@ GETSEL" << text; #endif + if (text.isEmpty()) + return 0; return env->NewString(reinterpret_cast<const jchar *>(text.constData()), jsize(text.length())); } |