From 5e04fb478a0eaa141616d07ead05fc8f935441a2 Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Wed, 31 Jan 2024 13:28:58 +0100
Subject: [PATCH] JNI: fix declaration of ElementType in
 QJniArray::makeObjectArray

List might be a reference type, in which case it won't have any members.

Change-Id: Iac2c08c42f31ebc67b31be157f73ae318d328a18
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit ddc67dcc5a270a3739514c23b88ed8612f0ae1f0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/corelib/kernel/qjniarray.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/corelib/kernel/qjniarray.h b/src/corelib/kernel/qjniarray.h
index 5dd3588ac4a..bfa5ec7a7cc 100644
--- a/src/corelib/kernel/qjniarray.h
+++ b/src/corelib/kernel/qjniarray.h
@@ -361,7 +361,7 @@ auto QJniArrayBase::makeArray(List &&list, NewFn &&newArray, SetFn &&setRegion)
 template <typename List>
 auto QJniArrayBase::makeObjectArray(List &&list)
 {
-    using ElementType = typename List::value_type;
+    using ElementType = typename q20::remove_cvref_t<List>::value_type;
     if (list.isEmpty())
         return QJniArray<jobject>();