From 1b84970b90c36771bf266f8612dba9585341795a Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Wed, 25 Dec 2024 12:10:27 +0100 Subject: [PATCH] JNI: don't pass jobject by reference And definitely not by non-const reference. Discovered during upcoming fixes for native function registration. Task-number: QTBUG-132410 Pick-to: 6.9 6.8 Change-Id: I0ce8519f5a1f9f3caffefc53e6d93b52509bc439 Reviewed-by: Thiago Macieira --- src/corelib/platform/android/qandroiditemmodelproxy.cpp | 2 +- src/corelib/platform/android/qandroiditemmodelproxy_p.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/platform/android/qandroiditemmodelproxy.cpp b/src/corelib/platform/android/qandroiditemmodelproxy.cpp index f17d417b1f1..eebd5582bd9 100644 --- a/src/corelib/platform/android/qandroiditemmodelproxy.cpp +++ b/src/corelib/platform/android/qandroiditemmodelproxy.cpp @@ -373,7 +373,7 @@ jobject QAndroidItemModelProxy::jni_sibling(JNIEnv *env, jobject object, jint ro } jboolean QAndroidItemModelProxy::jni_setData(JNIEnv *env, jobject object, JQtModelIndex index, - jobject &value, jint role) + jobject value, jint role) { const QModelIndex nativeIndex = QAndroidModelIndexProxy::qInstance(index); const QVariant qValue = QAndroidTypeConverter::toQVariant(QJniObject(value)); diff --git a/src/corelib/platform/android/qandroiditemmodelproxy_p.h b/src/corelib/platform/android/qandroiditemmodelproxy_p.h index 874f0533611..350fc643ca1 100644 --- a/src/corelib/platform/android/qandroiditemmodelproxy_p.h +++ b/src/corelib/platform/android/qandroiditemmodelproxy_p.h @@ -208,7 +208,7 @@ public: JQtModelIndex bottomRight, QJniArray roles); Q_DECLARE_JNI_NATIVE_METHOD_IN_CURRENT_SCOPE(jni_dataChanged) - static jboolean jni_setData(JNIEnv *env, jobject object, JQtModelIndex index, jobject &value, + static jboolean jni_setData(JNIEnv *env, jobject object, JQtModelIndex index, jobject value, jint role); Q_DECLARE_JNI_NATIVE_METHOD_IN_CURRENT_SCOPE(jni_setData)