diff --git a/src/corelib/text/qanystringview.h b/src/corelib/text/qanystringview.h index 68754931e9..774651cb6a 100644 --- a/src/corelib/text/qanystringview.h +++ b/src/corelib/text/qanystringview.h @@ -50,6 +50,7 @@ QT_BEGIN_NAMESPACE template class QStringBuilder; +template struct QConcatenable; class QAnyStringView { @@ -163,7 +164,7 @@ public: // defined in qstringbuilder.h template inline QAnyStringView(const QStringBuilder &expr, - typename QStringBuilder::ConvertTo &&capacity = {}); + typename QConcatenable>::ConvertTo &&capacity = {}); template = true> constexpr QAnyStringView(const Container &c) noexcept diff --git a/src/corelib/text/qstringbuilder.h b/src/corelib/text/qstringbuilder.h index 5a6a531e74..8494459d63 100644 --- a/src/corelib/text/qstringbuilder.h +++ b/src/corelib/text/qstringbuilder.h @@ -468,7 +468,7 @@ QString &operator+=(QString &a, const QStringBuilder &b) template QAnyStringView::QAnyStringView(const QStringBuilder &expr, - typename QStringBuilder::ConvertTo &&capacity) + typename QConcatenable>::ConvertTo &&capacity) : QAnyStringView(capacity = expr) {} QT_END_NAMESPACE diff --git a/tests/auto/corelib/text/qanystringview/tst_qanystringview.cpp b/tests/auto/corelib/text/qanystringview/tst_qanystringview.cpp index bbc0bdacfd..e5e3ac9f84 100644 --- a/tests/auto/corelib/text/qanystringview/tst_qanystringview.cpp +++ b/tests/auto/corelib/text/qanystringview/tst_qanystringview.cpp @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -230,6 +231,12 @@ static_assert(CanConvert> == CanConvertFromWCharT); static_assert(!CanConvert>); static_assert(!CanConvert>); +// +// QStringBuilder +// + +static_assert(CanConvert>); + class tst_QAnyStringView : public QObject { @@ -303,9 +310,13 @@ private Q_SLOTS: void fromChar16TContainers() const { fromContainers(); } void fromWCharTContainers() const { ONLY_WIN(fromContainers()); } + void fromQStringBuilder_QString_QString() const { fromQStringBuilder(u"1"_qs % u"2"_qs, u"12"); } + void comparison(); private: + template + void fromQStringBuilder(StringBuilder &&sb, QStringView expected) const; template void fromArray() const; template @@ -419,6 +430,13 @@ void tst_QAnyStringView::basics() const QVERIFY(!(sv2 != sv1)); } +template +void tst_QAnyStringView::fromQStringBuilder(StringBuilder &&sb, QStringView expected) const +{ + auto toAnyStringView = [](QAnyStringView sv) { return sv; }; + QCOMPARE(toAnyStringView(std::forward(sb)), expected); +} + template void tst_QAnyStringView::fromArray() const {