diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-01-22 01:03:19 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-01-22 13:08:05 +0100 |
| commit | 3ec587666f89c996cc0a403775c352954d8b804f (patch) | |
| tree | 136de574c1e26e4ab150902b5c319269cea10b81 /src/corelib/text/qbytearraylist.h | |
| parent | 902087a090cfeae36adcb1b9f0948987ad7d2f4c (diff) | |
QByteArrayList: optimize 32-bit builds of legacy join() helper
On 32-bit machines, qsizetype is int, so we don't actually need to
QT_REMOVE_SINCE the QByteArrayList_join() helper, because it didn't
change.
Thanks to Thiago for showing me the QT_POINTER_SIZE trick in a similar
change to QVersionNumber.
Pick-to: 6.3
Change-Id: Iae6e315107e42da51fcb4e7325b6d40b9c3fe0bc
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/corelib/text/qbytearraylist.h')
| -rw-r--r-- | src/corelib/text/qbytearraylist.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/text/qbytearraylist.h b/src/corelib/text/qbytearraylist.h index c4985047fa..de5546c8ce 100644 --- a/src/corelib/text/qbytearraylist.h +++ b/src/corelib/text/qbytearraylist.h @@ -58,10 +58,10 @@ typedef QMutableListIterator<QByteArray> QMutableByteArrayListIterator; #ifndef Q_CLANG_QDOC namespace QtPrivate { -#if QT_REMOVED_SINCE(6, 3) +#if QT_REMOVED_SINCE(6, 3) && QT_POINTER_SIZE != 4 QByteArray Q_CORE_EXPORT QByteArrayList_join(const QByteArrayList *that, const char *separator, int separatorLength); #endif - QByteArray Q_CORE_EXPORT QByteArrayList_join(const QByteArrayList *that, QByteArrayView separator); + QByteArray Q_CORE_EXPORT QByteArrayList_join(const QByteArrayList *that, const char *sep, qsizetype len); } #endif @@ -82,7 +82,7 @@ public: QByteArray join(QByteArrayView sep = {}) const { - return QtPrivate::QByteArrayList_join(self(), sep); + return QtPrivate::QByteArrayList_join(self(), sep.data(), sep.size()); } Q_WEAK_OVERLOAD inline QByteArray join(const QByteArray &sep) const |