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/compat/removed_api.cpp | |
| 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/compat/removed_api.cpp')
| -rw-r--r-- | src/corelib/compat/removed_api.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/compat/removed_api.cpp b/src/corelib/compat/removed_api.cpp index 5f59cf047a..d27656bf7a 100644 --- a/src/corelib/compat/removed_api.cpp +++ b/src/corelib/compat/removed_api.cpp @@ -108,10 +108,12 @@ QUuid QUuid::fromRfc4122(const QByteArray &bytes) #include "qbytearraylist.h" +# if QT_POINTER_SIZE != 4 QByteArray QtPrivate::QByteArrayList_join(const QByteArrayList *that, const char *sep, int seplen) { - return QByteArrayList_join(that, {sep, seplen}); + return QByteArrayList_join(that, sep, qsizetype(seplen)); } +# endif #endif // QT_REMOVED_SINCE(6, 3) |