From 3dc1339dba5c42d3891285a0a9f4b8d4b3195ce6 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Mon, 16 Nov 2020 20:13:28 +0100
Subject: QV4Engine: Fix conversion of char16_t

This is a single char16_t, not an array of them.

Pick-to: 5.15
Change-Id: I55d23ebb5f2abebd43cd4160a75d373706392ddf
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
---
 src/qml/jsruntime/qv4engine.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/qml/jsruntime')

diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index b09f874ef3..a96e93c212 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -1758,7 +1758,7 @@ QV4::ReturnedValue QV4::ExecutionEngine::fromVariant(const QVariant &variant)
             case QMetaType::QChar:
                 return newString(*reinterpret_cast<const QChar *>(ptr))->asReturnedValue();
             case QMetaType::Char16:
-                return newString(QString::fromUtf16(reinterpret_cast<const char16_t *>(ptr)))->asReturnedValue();
+                return newString(QChar(*reinterpret_cast<const char16_t *>(ptr)))->asReturnedValue();
             case QMetaType::QDateTime:
                 return QV4::Encode(newDateObject(*reinterpret_cast<const QDateTime *>(ptr)));
             case QMetaType::QDate:
-- 
cgit v1.2.3