From 2a5d0dcf108d665e8f554fa2ca50e434d8bbd97e Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Mon, 9 Dec 2024 14:03:15 +0100
Subject: [PATCH] tst_QStringView: add missing CanConvert from char16_t/wchar_t
 arrays

QChar[N] and ushort[N] are being checked, it's unclear why char16_t[N]
and wchar_t[N] were missing.

Add them.

Pick-to: 6.5 5.15
Change-Id: I9a2df2a75886b950e8c2bdec843e3e693e536f86
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
(cherry picked from commit 89401858696d63b8a13c945d5db63856a3b6f5ba)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 67adc2227dc179828d01475c2b9e534bca3152b7)
---
 tests/auto/corelib/text/qstringview/tst_qstringview.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/auto/corelib/text/qstringview/tst_qstringview.cpp b/tests/auto/corelib/text/qstringview/tst_qstringview.cpp
index 3f87ffc9fc3..ed104f19c3a 100644
--- a/tests/auto/corelib/text/qstringview/tst_qstringview.cpp
+++ b/tests/auto/corelib/text/qstringview/tst_qstringview.cpp
@@ -75,6 +75,8 @@ static_assert(!CanConvert<std::list<ushort>>::value);
 
 static_assert(!CanConvert<char16_t>::value);
 
+static_assert(CanConvert<char16_t[123]>::value);
+
 static_assert(CanConvert<      char16_t*>::value);
 static_assert(CanConvert<const char16_t*>::value);
 
@@ -111,6 +113,8 @@ constexpr bool CanConvertFromWCharT =
 
 static_assert(!CanConvert<wchar_t>::value);
 
+static_assert(CanConvert<wchar_t[123]>::value == CanConvertFromWCharT);
+
 static_assert(CanConvert<      wchar_t*>::value == CanConvertFromWCharT);
 static_assert(CanConvert<const wchar_t*>::value == CanConvertFromWCharT);