summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@theqtcompany.com>2015-05-19 16:07:42 +0200
committerPaul Olav Tvete <paul.tvete@theqtcompany.com>2015-05-20 07:42:56 +0000
commite2102752ba8ccafef1cc480e82463ea76685a4e2 (patch)
treecdcd2d691db3350dfa364ac28c0f4b0b69d5999b
parentb6634023faf7de3a85aba489fa2763f8a79fd9f5 (diff)
Workaround for Samsung keyboard bug
Return null string instead of empty string when the selection is empty. It looks like Samsung just tests for selection == null when doing backspace. Task-number: QTBUG-45785 Change-Id: Id26ce707130777fcd0ab1a4cff08367bb2810f2f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
-rw-r--r--src/plugins/platforms/android/qandroidinputcontext.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/android/qandroidinputcontext.cpp b/src/plugins/platforms/android/qandroidinputcontext.cpp
index 88bc4a653a..5c8406ca03 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()));
}