1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix deprecation warning, use char16_t instead of quint16/ushort

Browse Source 
Change-Id: I4021abb901260c3e27cefd81b3acd5ac198941c8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Volker Hilsheimer 2020-06-08 12:33:31 +02:00
parent 2df31c8f2e
commit ac419a66fd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/painting/qicc.cpp
View File

@ -606,8 +606,8 @@ bool parseDesc(const QByteArray &data, const TagEntry &tagEntry, QString &descNa
// The given length shouldn't include 0-termination, but might. // The given length shouldn't include 0-termination, but might.
if (stringLen > 1 && unicodeString[stringLen - 1] == 0) if (stringLen > 1 && unicodeString[stringLen - 1] == 0)
--stringLen; --stringLen;
QVarLengthArray<quint16> utf16hostendian(stringLen); QVarLengthArray<char16_t> utf16hostendian(stringLen);
qFromBigEndian<ushort>(unicodeString, stringLen, utf16hostendian.data()); qFromBigEndian<char16_t>(unicodeString, stringLen, utf16hostendian.data());
descName = QString::fromUtf16(utf16hostendian.data(), stringLen); descName = QString::fromUtf16(utf16hostendian.data(), stringLen);
return true; return true;
} }