summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-08-17 03:03:00 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-08-17 03:03:05 +0200
commit53e99cbb2f73efd6e4adc7b13400fdc7fc74f345 (patch)
treea655e5cf49b2ebbdf2cd52fed8b766df5de300b8
parentc158f8d5179957084fd7ec1c2f97086b45604f56 (diff)
parent06dae4c2dec82a9eb5132b7a96205051bae30c15 (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
-rw-r--r--src/androidextras/android/qandroidintent.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/androidextras/android/qandroidintent.cpp b/src/androidextras/android/qandroidintent.cpp
index fff6e9c..ee6accf 100644
--- a/src/androidextras/android/qandroidintent.cpp
+++ b/src/androidextras/android/qandroidintent.cpp
@@ -112,7 +112,7 @@ void QAndroidIntent::putExtra(const QString &key, const QByteArray &data)
QAndroidJniEnvironment env;
jbyteArray array = env->NewByteArray(data.size());
env->SetByteArrayRegion(array, 0, data.length(), reinterpret_cast<const jbyte*>(data.constData()));
- m_handle.callMethod<void>("putExtra", "(Ljava/lang/String;[B)Landroid/content/Intent;",
+ m_handle.callObjectMethod("putExtra", "(Ljava/lang/String;[B)Landroid/content/Intent;",
QAndroidJniObject::fromString(key).object(), array);
env->DeleteLocalRef(array);
}