diff --git a/src/corelib/text/qbytearraylist.cpp b/src/corelib/text/qbytearraylist.cpp index cd77cd905a9..e23bdc7bd85 100644 --- a/src/corelib/text/qbytearraylist.cpp +++ b/src/corelib/text/qbytearraylist.cpp @@ -102,12 +102,6 @@ QT_BEGIN_NAMESPACE \sa QByteArray, QStringList */ -/*! - \fn QByteArray QByteArrayList::join() const - - Joins all the byte arrays into a single byte array. -*/ - /*! \fn QByteArray QByteArrayList::join(const QByteArray &separator) const @@ -120,7 +114,7 @@ QT_BEGIN_NAMESPACE \since 6.3 Joins all the byte arrays into a single byte array with each - element separated by the given \a separator. + element separated by the given \a separator, if any. */ /*! diff --git a/src/corelib/text/qbytearraylist.h b/src/corelib/text/qbytearraylist.h index 890cbcef2d6..ce613fbe3f8 100644 --- a/src/corelib/text/qbytearraylist.h +++ b/src/corelib/text/qbytearraylist.h @@ -80,9 +80,7 @@ public: using QListSpecialMethodsBase::lastIndexOf; using QListSpecialMethodsBase::contains; - inline QByteArray join() const - { return join(QByteArrayView{}); } - inline QByteArray join(QByteArrayView sep) const // ### Qt 7: merge with the () overload + QByteArray join(QByteArrayView sep = {}) const { return QtPrivate::QByteArrayList_join(self(), sep); }