summaryrefslogtreecommitdiffstats
path: root/src/gui/util/qhexstring_p.h
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2020-04-27 11:17:31 +0200
committerMarc Mutz <marc.mutz@kdab.com>2020-04-30 00:30:57 +0200
commit7a8b277d5bcfd3597b6634e0402ac5f7202d9b71 (patch)
treeb11a82c51198bff3b817085aa4378dea976d9e24 /src/gui/util/qhexstring_p.h
parent1337e8fe46ac7934f80b8a95b84b5cb61707f8e4 (diff)
QtGui: fix a few more char/int/uint -> QChar conversions
They were masked by all QChar ctors being made explicit, except the char16_t one, which was left as the only viable choice. Change-Id: I343269b61d555c259b5780011e99f85f5375ef78 Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/gui/util/qhexstring_p.h')
-rw-r--r--src/gui/util/qhexstring_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/util/qhexstring_p.h b/src/gui/util/qhexstring_p.h
index d30a8eeee8..2afbf3a42b 100644
--- a/src/gui/util/qhexstring_p.h
+++ b/src/gui/util/qhexstring_p.h
@@ -69,7 +69,7 @@ template <typename T>
inline void write(QChar *&dest) const
{
- const ushort hexChars[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+ const char16_t hexChars[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
const char *c = reinterpret_cast<const char *>(&val);
for (uint i = 0; i < sizeof(T); ++i) {
*dest++ = hexChars[*c & 0xf];