Adapt QML's QString-internal hacks to use char16_t, not ushort

The QML engine pokes around in QString's privates, so will break when
we change those privates to use char16_t; this patch shall fix that
up, once the char16_t-ification of QString has landed in qtbase.

Change-Id: I5302c339f3c892ff977c8ebb521ff4c82d237885
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/qmlmodels/qqmllistmodel_p_p.h b/src/qmlmodels/qqmllistmodel_p_p.h
index f17004ed3b..9e1258c1d9 100644
--- a/src/qmlmodels/qqmllistmodel_p_p.h
+++ b/src/qmlmodels/qqmllistmodel_p_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtQml module of the Qt Toolkit.
@@ -263,11 +263,11 @@ private:
     void clear();
 
     union {
-        ushort *stringData = nullptr;
+        char16_t *stringData = nullptr;
         const QV4::CompiledData::Binding *binding;
     };
 
-    QTypedArrayData<ushort> *arrayData = nullptr;
+    QTypedArrayData<char16_t> *arrayData = nullptr;
     uint stringSize = 0;
 };