diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2024-01-31 13:28:58 +0100 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2024-01-31 21:18:48 +0100 |
commit | ddc67dcc5a270a3739514c23b88ed8612f0ae1f0 (patch) | |
tree | a523d7b9191c28513df4581af5e6910568ca2bbc /src/corelib/kernel | |
parent | 43f66e619176e4903aa62a30dc5ae2122e22f13a (diff) |
JNI: fix declaration of ElementType in QJniArray::makeObjectArray
List might be a reference type, in which case it won't have any members.
Pick-to: 6.7
Change-Id: Iac2c08c42f31ebc67b31be157f73ae318d328a18
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r-- | src/corelib/kernel/qjniarray.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qjniarray.h b/src/corelib/kernel/qjniarray.h index 5dd3588ac4..bfa5ec7a7c 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>(); |