diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2021-11-19 09:15:31 -0800 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-11-20 05:08:49 +0000 |
| commit | 96e179484391dbf14c057ab171390324c39cbf82 (patch) | |
| tree | 9517d06d5f4edf3f011a40af9e9a92a7510cada7 /src/corelib/text | |
| parent | 5214f0faeba5e2be7f6af76ad9236ba1426f05b5 (diff) | |
QString::fromUtf16: use qustrlen
We have it.
Change-Id: Iccb47e5527544b6fbd75fffd16b901fe4d2920a7
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 09c58614db074b99f327063424e480e9842e1e45)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/corelib/text')
| -rw-r--r-- | src/corelib/text/qstring.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp index a5611fcc8d..b89ce78ea1 100644 --- a/src/corelib/text/qstring.cpp +++ b/src/corelib/text/qstring.cpp @@ -5492,11 +5492,8 @@ QString QString::fromUtf16(const char16_t *unicode, qsizetype size) { if (!unicode) return QString(); - if (size < 0) { - size = 0; - while (unicode[size] != 0) - ++size; - } + if (size < 0) + size = QtPrivate::qustrlen(unicode); QStringDecoder toUtf16(QStringDecoder::Utf16, QStringDecoder::Flag::Stateless); return toUtf16(QByteArrayView(reinterpret_cast<const char *>(unicode), size * 2)); } |