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

JNI: fix declaration of ElementType in QJniArray::makeObjectArray

Browse Source 
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>
This commit is contained in:
Volker Hilsheimer 2024-01-31 13:28:58 +01:00 committed by Qt Cherry-pick Bot
parent 53497c0a01
commit 5e04fb478a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/kernel/qjniarray.h
View File

@ -361,7 +361,7 @@ auto QJniArrayBase::makeArray(List &&list, NewFn &&newArray, SetFn &&setRegion)
template <typename List> template <typename List>
auto QJniArrayBase::makeObjectArray(List &&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()) if (list.isEmpty())
return QJniArray<jobject>(); return QJniArray<jobject>();