summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2020-01-30 14:46:37 -0800
committerThiago Macieira <thiago.macieira@intel.com>2020-02-13 15:11:53 -0800
commitc0c2efc3c62432b4ae159b911018682f573b54e4 (patch)
tree2e57481e5ac0fc001c323fdb6bb0e97a87683eda /src/corelib
parent210fd52e0d5e77105c676c064e7c3a69a00e2122 (diff)
QStringView: Fix warning about conversion from qsizetype to int
Fixes: QTBUG-81764 Change-Id: If79a52e476594446baccfffd15eecb9d9e578118 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/text/qstring.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h
index 1669d7c94a..3919dbf76c 100644
--- a/src/corelib/text/qstring.h
+++ b/src/corelib/text/qstring.h
@@ -1122,7 +1122,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));