Commit ec731f55 authored by Qt Forward Merge Bot's avatar Qt Forward Merge Bot
Browse files

Merge remote-tracking branch 'origin/5.12' into dev

Change-Id: Id4e120f3ab9ea1de9a0d3c86f1687807830fc435
Showing with 1 addition and 1 deletion
...@@ -112,7 +112,7 @@ void QAndroidIntent::putExtra(const QString &key, const QByteArray &data) ...@@ -112,7 +112,7 @@ void QAndroidIntent::putExtra(const QString &key, const QByteArray &data)
QAndroidJniEnvironment env; QAndroidJniEnvironment env;
jbyteArray array = env->NewByteArray(data.size()); jbyteArray array = env->NewByteArray(data.size());
env->SetByteArrayRegion(array, 0, data.length(), reinterpret_cast<const jbyte*>(data.constData())); 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); QAndroidJniObject::fromString(key).object(), array);
env->DeleteLocalRef(array); env->DeleteLocalRef(array);
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment