diff options
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r-- | src/corelib/kernel/qjniarray.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/corelib/kernel/qjniarray.h b/src/corelib/kernel/qjniarray.h index 302a8aa9dc..9305679b31 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 {}; |