From f4f70c3e85c51b9292a820e83d384c861550b4be Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Fri, 23 Feb 2024 11:29:06 +0100
Subject: [PATCH] JNI: Move QJniArray constructor into the class body

Change-Id: Iae54afeef3b2017899c4ab1ec322efa3d0b819e2
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
---
 src/corelib/kernel/qjniarray.h | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/corelib/kernel/qjniarray.h b/src/corelib/kernel/qjniarray.h
index 302a8aa9dc0..9305679b31b 100644
--- a/src/corelib/kernel/qjniarray.h
+++ b/src/corelib/kernel/qjniarray.h
@@ -221,7 +221,10 @@ public:
     template <typename Container
         , IfCanConvert<Container> = true
     >
-    explicit QJniArray(Container &&container);
+    explicit QJniArray(Container &&container)
+        : QJniArrayBase(QJniArrayBase::fromContainer(std::forward<Container>(container)))
+    {
+    }
 
     template <typename Other, std::enable_if_t<std::is_convertible_v<Other, Type>, bool> = true>
     QJniArray(QJniArray<Other> &&other)
@@ -420,16 +423,6 @@ auto QJniArrayBase::makeObjectArray(List &&list)
     return ResultType(localArray);
 }
 
-
-template <typename T>
-template <typename Container
-    , QJniArrayBase::IfCanConvert<Container>
->
-QJniArray<T>::QJniArray(Container &&container)
-    : QJniArrayBase(QJniArrayBase::fromContainer(std::forward<Container>(container)))
-{
-}
-
 namespace QtJniTypes
 {
 template <typename T> struct IsJniArray: std::false_type {};