From be3b8e6a1476bec9ad8692ea76afb5e2a613879c Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 11 Feb 2025 08:38:50 -0800 Subject: [PATCH] tst_QByteArrayView: stop using std::basic_string That's not a valid type for the Standard's string, because the Standard doesn't allow for std::char_traits either. Fixes: QTBUG-133689 Change-Id: Icd0d4928fa4cdc9d806bfffd4053f0eb1073e6b4 Reviewed-by: Marc Mutz (cherry picked from commit 0cc41083c30c1474a862a34b59a4f755d4c51640) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 5b10a1e8b4137cd8031f100039c39a1cc93f5d4e) --- .../auto/corelib/text/qbytearrayview/tst_qbytearrayview.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/auto/corelib/text/qbytearrayview/tst_qbytearrayview.cpp b/tests/auto/corelib/text/qbytearrayview/tst_qbytearrayview.cpp index 3d11598d00..16004b1ea4 100644 --- a/tests/auto/corelib/text/qbytearrayview/tst_qbytearrayview.cpp +++ b/tests/auto/corelib/text/qbytearrayview/tst_qbytearrayview.cpp @@ -695,7 +695,11 @@ void tst_QByteArrayView::fromContainers() const fromContainer>(); fromContainer>(); fromContainer>(); - fromContainer>(); + if constexpr (std::is_same_v) { + // std::basic_string only supports a few specific types + // (std::char_traits requirement) + fromContainer>(); + } } void tst_QByteArrayView::comparison() const