diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-06-08 12:33:31 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-06-08 14:01:41 +0200 |
| commit | ac419a66fd0ec4093579ab8dc8ec8b974045c3ca (patch) | |
| tree | 44d25787c2dce8506fb33e08a126a0867f575005 | |
| parent | 2df31c8f2e044de68898bd744adec676d75b2e7e (diff) | |
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>
| -rw-r--r-- | src/gui/painting/qicc.cpp | 4 |
1 files 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; } |