From 5c2a55884b688350d72dcc3187cf291fe3d3a697 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Fri, 18 Aug 2023 21:45:08 -0700 Subject: [PATCH] Qt: Fix remaining non-Multimedia Qt 6 build issues --- src/platform/qt/MemoryModel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/platform/qt/MemoryModel.cpp b/src/platform/qt/MemoryModel.cpp index 1777fddd0..538ce2c51 100644 --- a/src/platform/qt/MemoryModel.cpp +++ b/src/platform/qt/MemoryModel.cpp @@ -321,7 +321,7 @@ QString MemoryModel::decodeText(const QByteArray& bytes) { text = QString::fromUtf8(array); } else { for (uint8_t c : bytes) { - text.append((uchar) c); + text.append(QChar(c)); } } return text; @@ -488,7 +488,7 @@ void MemoryModel::paintEvent(QPaintEvent*) { for (int i = 0; i < text.size() && i < m_align; ++i) { const QChar c = text.at(i); const QPointF location(viewport()->size().width() - (16 - x - i) * m_margins.right() / 17.0 - m_letterWidth * 0.5, yp); - if (c < 256) { + if (c.unicode() < 256) { painter.drawStaticText(location, m_staticLatin1[c.cell()]); } else { painter.drawText(location, c);