diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2021-11-19 09:15:31 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2021-11-19 18:33:07 -0800 |
| commit | 09c58614db074b99f327063424e480e9842e1e45 (patch) | |
| tree | bac2ca3df2bbe0e063def5c12c785076dc582f9f /src/corelib/text | |
| parent | fd8f81f3859fe92082caec925223e08cf61c69d4 (diff) | |
QString::fromUtf16: use qustrlen
We have it.
Pick-to: 6.2
Change-Id: Iccb47e5527544b6fbd75fffd16b901fe4d2920a7
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
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 450ea484f6..291e2c37ab 100644 --- a/src/corelib/text/qstring.cpp +++ b/src/corelib/text/qstring.cpp @@ -5462,11 +5462,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)); } |