diff --git a/src/corelib/text/qbytearray.h b/src/corelib/text/qbytearray.h index f6df2d30141..4f4bb6309bd 100644 --- a/src/corelib/text/qbytearray.h +++ b/src/corelib/text/qbytearray.h @@ -684,11 +684,13 @@ inline QByteArray operator+(const char *a1, const QByteArray &a2) { return QByteArray(a1) += a2; } inline QByteArray operator+(char a1, const QByteArray &a2) { return QByteArray(&a1, 1) += a2; } +Q_WEAK_OVERLOAD inline QByteArray operator+(const QByteArray &lhs, QByteArrayView rhs) { QByteArray tmp{lhs.size() + rhs.size(), Qt::Uninitialized}; return tmp.assign(lhs).append(rhs); } +Q_WEAK_OVERLOAD inline QByteArray operator+(QByteArrayView lhs, const QByteArray &rhs) { QByteArray tmp{lhs.size() + rhs.size(), Qt::Uninitialized}; diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder6/tst_qstringbuilder6.cpp b/tests/auto/corelib/text/qstringbuilder/qstringbuilder6/tst_qstringbuilder6.cpp index 5393ec2b905..d766ae04a05 100644 --- a/tests/auto/corelib/text/qstringbuilder/qstringbuilder6/tst_qstringbuilder6.cpp +++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder6/tst_qstringbuilder6.cpp @@ -20,8 +20,6 @@ #define LITERAL "some literal" -#define HAS_QTBUG_127928 1 - namespace { #define P + #include "../qstringbuilder1/stringbuilder.cpp"