From 09c58614db074b99f327063424e480e9842e1e45 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Fri, 19 Nov 2021 09:15:31 -0800
Subject: QString::fromUtf16: use qustrlen
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We have it.

Pick-to: 6.2
Change-Id: Iccb47e5527544b6fbd75fffd16b901fe4d2920a7
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 src/corelib/text/qstring.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/corelib/text')

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));
 }
-- 
cgit v1.2.3