From ac419a66fd0ec4093579ab8dc8ec8b974045c3ca Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Mon, 8 Jun 2020 12:33:31 +0200
Subject: Fix deprecation warning, use char16_t instead of quint16/ushort

Change-Id: I4021abb901260c3e27cefd81b3acd5ac198941c8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
---
 src/gui/painting/qicc.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/painting/qicc.cpp b/src/gui/painting/qicc.cpp
index 32d67ea76a..ea18f38c66 100644
--- a/src/gui/painting/qicc.cpp
+++ b/src/gui/painting/qicc.cpp
@@ -606,8 +606,8 @@ bool parseDesc(const QByteArray &data, const TagEntry &tagEntry, QString &descNa
     // The given length shouldn't include 0-termination, but might.
     if (stringLen > 1 && unicodeString[stringLen - 1] == 0)
         --stringLen;
-    QVarLengthArray<quint16> utf16hostendian(stringLen);
-    qFromBigEndian<ushort>(unicodeString, stringLen, utf16hostendian.data());
+    QVarLengthArray<char16_t> utf16hostendian(stringLen);
+    qFromBigEndian<char16_t>(unicodeString, stringLen, utf16hostendian.data());
     descName = QString::fromUtf16(utf16hostendian.data(), stringLen);
     return true;
 }
-- 
cgit v1.2.3