diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-28 07:36:46 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-28 07:36:51 +0200 |
| commit | 79052c5be918a18ca6d02bbf6118088ba3e333a1 (patch) | |
| tree | 4a6165d3b2a76d1504f4cb6ae09e6b0bdb8aae3a | |
| parent | 503ba3db8749b49ed2e4705fd353c897dae390a5 (diff) | |
| parent | 74d54cf7711bbabe369fc67714ae14713abba325 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"
| -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 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); } |