Merge remote-tracking branch 'origin/5.14' into 5.15

 Conflicts:
	src/corelib/tools/qlinkedlist.h
	src/plugins/platforms/wasm/qwasmintegration.cpp
	src/plugins/platforms/wasm/qwasmscreen.cpp

Change-Id: Iefca7f9f4966bdc20e7052aca736874861055738

1 files changed, 1 insertions, 1 deletions

diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h
index 1f4e856660..61325c7486 100644
--- a/src/corelib/text/qstring.h
+++ b/src/corelib/text/qstring.h
@@ -1124,7 +1124,7 @@ int QStringView::toWCharArray(wchar_t *array) const
     if (sizeof(wchar_t) == sizeof(QChar)) {
         if (auto src = data())
             memcpy(array, src, sizeof(QChar) * size());
-        return size();
+        return int(size());     // ### q6sizetype
     } else {
         return QString::toUcs4_helper(reinterpret_cast<const ushort *>(data()), int(size()),
                                       reinterpret_cast<uint *>(array));