1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JNI: don't pass jobject by reference

Browse Source 
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 <thiago.macieira@intel.com>
This commit is contained in:
Volker Hilsheimer 2024-12-25 12:10:27 +01:00
parent cfd3c84184
commit 1b84970b90
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/platform/android/qandroiditemmodelproxy.cpp
View File

@ -373,7 +373,7 @@ jobject QAndroidItemModelProxy::jni_sibling(JNIEnv *env, jobject object, jint ro
} }
jboolean QAndroidItemModelProxy::jni_setData(JNIEnv *env, jobject object, JQtModelIndex index, 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 QModelIndex nativeIndex = QAndroidModelIndexProxy::qInstance(index);
const QVariant qValue = QAndroidTypeConverter::toQVariant(QJniObject(value)); const QVariant qValue = QAndroidTypeConverter::toQVariant(QJniObject(value));

2
src/corelib/platform/android/qandroiditemmodelproxy_p.h
View File

@ -208,7 +208,7 @@ public:
JQtModelIndex bottomRight, QJniArray<jint> roles); JQtModelIndex bottomRight, QJniArray<jint> roles);
Q_DECLARE_JNI_NATIVE_METHOD_IN_CURRENT_SCOPE(jni_dataChanged) 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); jint role);
Q_DECLARE_JNI_NATIVE_METHOD_IN_CURRENT_SCOPE(jni_setData) Q_DECLARE_JNI_NATIVE_METHOD_IN_CURRENT_SCOPE(jni_setData)