diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-05 03:02:10 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-05 03:02:10 +0100 |
commit | ec731f559cbf875dfd758b5dcee123947eaad3a2 (patch) | |
tree | 67f021b7fc1765bf287147f25c835a324a4ee74c | |
parent | ae1a2533f65b3af2e09199b8112509577040fba2 (diff) | |
parent | 328418b07dd6f530095008f8a062fa50d2731fe3 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Id4e120f3ab9ea1de9a0d3c86f1687807830fc435
-rw-r--r-- | src/androidextras/android/qandroidintent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/androidextras/android/qandroidintent.cpp b/src/androidextras/android/qandroidintent.cpp index 5c89b89..fff6e9c 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.callMethod<void>("putExtra", "(Ljava/lang/String;[B)Landroid/content/Intent;", QAndroidJniObject::fromString(key).object(), array); env->DeleteLocalRef(array); } |