From a81ea3d11432a86d0411c9d8806607c6f3ed7573 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Fri, 24 Mar 2023 08:22:56 +0100
Subject: [PATCH] tst_Q(Any)StringView: check conversion from winrt::hstring
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Instead of adding more QString::fromMyFavoriteStringImpl(), just check
that

   QStringView{myFavoriteStringImpl}.toString()

works.

It does.

Pick-to: 6.5
Task-number: QTBUG-111886
Change-Id: I337282611360b4a56a10c8acfd2d7d53ea196d5b
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 .../text/qanystringview/tst_qanystringview.cpp  | 16 ++++++++++++++++
 .../text/qstringview/tst_qstringview.cpp        | 17 +++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/tests/auto/corelib/text/qanystringview/tst_qanystringview.cpp b/tests/auto/corelib/text/qanystringview/tst_qanystringview.cpp
index 5f96347195..591c82ab8d 100644
--- a/tests/auto/corelib/text/qanystringview/tst_qanystringview.cpp
+++ b/tests/auto/corelib/text/qanystringview/tst_qanystringview.cpp
@@ -7,6 +7,9 @@
 #include <QString>
 #include <QStringBuilder>
 #include <QVarLengthArray>
+#if QT_CONFIG(cpp_winrt)
+#  include <private/qt_winrtbase_p.h>
+#endif
 #include <private/qxmlstream_p.h>
 
 #include <QTest>
@@ -236,6 +239,19 @@ static_assert(!CanConvert<std::list<wchar_t>>);
 
 static_assert(CanConvert<QStringBuilder<QString, QString>>);
 
+#if QT_CONFIG(cpp_winrt)
+
+//
+// winrt::hstring (QTBUG-111886)
+//
+
+static_assert(CanConvert<      winrt::hstring >);
+static_assert(CanConvert<const winrt::hstring >);
+static_assert(CanConvert<      winrt::hstring&>);
+static_assert(CanConvert<const winrt::hstring&>);
+
+#endif // QT_CONFIG(cpp_winrt)
+
 
 class tst_QAnyStringView : public QObject
 {
diff --git a/tests/auto/corelib/text/qstringview/tst_qstringview.cpp b/tests/auto/corelib/text/qstringview/tst_qstringview.cpp
index 634a0b90cb..f510e9a822 100644
--- a/tests/auto/corelib/text/qstringview/tst_qstringview.cpp
+++ b/tests/auto/corelib/text/qstringview/tst_qstringview.cpp
@@ -7,8 +7,12 @@
 #include <QChar>
 #include <QVarLengthArray>
 #include <QList>
+#if QT_CONFIG(cpp_winrt)
+#  include <private/qt_winrtbase_p.h>
+#endif
 #include <private/qxmlstream_p.h>
 
+
 #include <QTest>
 
 #include <string>
@@ -127,6 +131,19 @@ static_assert(CanConvert<std::array<wchar_t, 123>>::value == CanConvertFromWChar
 static_assert(!CanConvert<std::deque<wchar_t>>::value);
 static_assert(!CanConvert<std::list<wchar_t>>::value);
 
+#if QT_CONFIG(cpp_winrt)
+
+//
+// winrt::hstring (QTBUG-111886)
+//
+
+static_assert(CanConvert<      winrt::hstring >::value);
+static_assert(CanConvert<const winrt::hstring >::value);
+static_assert(CanConvert<      winrt::hstring&>::value);
+static_assert(CanConvert<const winrt::hstring&>::value);
+
+#endif // QT_CONFIG(cpp_winrt)
+
 class tst_QStringView : public QObject
 {
     Q_OBJECT