diff options
| -rw-r--r-- | src/corelib/text/qbytearraylist.cpp | 8 | ||||
| -rw-r--r-- | src/corelib/text/qbytearraylist.h | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/corelib/text/qbytearraylist.cpp b/src/corelib/text/qbytearraylist.cpp index cd77cd905a..e23bdc7bd8 100644 --- a/src/corelib/text/qbytearraylist.cpp +++ b/src/corelib/text/qbytearraylist.cpp @@ -103,12 +103,6 @@ QT_BEGIN_NAMESPACE */ /*! - \fn QByteArray QByteArrayList::join() const - - Joins all the byte arrays into a single byte array. -*/ - -/*! \fn QByteArray QByteArrayList::join(const QByteArray &separator) const Joins all the byte arrays into a single byte array with each @@ -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 890cbcef2d..ce613fbe3f 100644 --- a/src/corelib/text/qbytearraylist.h +++ b/src/corelib/text/qbytearraylist.h @@ -80,9 +80,7 @@ public: using QListSpecialMethodsBase<QByteArray>::lastIndexOf; using QListSpecialMethodsBase<QByteArray>::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); } |