path: root/src/corelib/compat/removed_api.cpp
diff options
authorMarc Mutz <>2021-11-03 16:04:31 +0100
committerMarc Mutz <>2021-11-05 09:06:22 +0100
commitfaa854ffeb1e028c401b449f1b18ee3ae92263e0 (patch)
tree9101db8e5d9bfe3ab548ea1beeb21b2117c07252 /src/corelib/compat/removed_api.cpp
parent0b768e3c43887fe35c2df4ca4263f54ebb7fec9d (diff)
QByteArrayList: fix narrowing in join() implementations [2/2]
We forgot to adjust the interface and implementation of join() to the int → qsizetype change in Qt 6. This part of the two-part patch fixes things in a non-forwards-BC way, so it can't be picked into released versions. The forwards-BC part is in the first patch of the series. We can't just replace the int seplen with qsizetype, because qsizetype is an alias to int on 32-bit platforms. So, pass the separator by QByteArrayView. [ChangeLog][QtCore][QByteArrayList] Fixed a bug when calling join() with separators of length > INTMAX. Change-Id: I2ccc61de1c8901ac5504aea1ebd895d12dbcb064 Reviewed-by: Mårten Nordheim <>
Diffstat (limited to 'src/corelib/compat/removed_api.cpp')
1 files changed, 7 insertions, 0 deletions
diff --git a/src/corelib/compat/removed_api.cpp b/src/corelib/compat/removed_api.cpp
index b2e758d2ca..8d5bfb44a7 100644
--- a/src/corelib/compat/removed_api.cpp
+++ b/src/corelib/compat/removed_api.cpp
@@ -89,6 +89,13 @@ QUuid QUuid::fromRfc4122(const QByteArray &bytes)
return fromRfc4122(qToByteArrayViewIgnoringNull(bytes));
+#include "qbytearraylist.h"
+QByteArray QtPrivate::QByteArrayList_join(const QByteArrayList *that, const char *sep, int seplen)
+ return QByteArrayList_join(that, {sep, seplen});
// #include <qotherheader.h>
// // implement removed functions from qotherheader.h