mirror of https://github.com/mgba-emu/mgba.git
Qt: Fix remaining non-Multimedia Qt 6 build issues
This commit is contained in:
parent
613ce0286a
commit
5c2a55884b
|
@ -321,7 +321,7 @@ QString MemoryModel::decodeText(const QByteArray& bytes) {
|
||||||
text = QString::fromUtf8(array);
|
text = QString::fromUtf8(array);
|
||||||
} else {
|
} else {
|
||||||
for (uint8_t c : bytes) {
|
for (uint8_t c : bytes) {
|
||||||
text.append((uchar) c);
|
text.append(QChar(c));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return text;
|
return text;
|
||||||
|
@ -488,7 +488,7 @@ void MemoryModel::paintEvent(QPaintEvent*) {
|
||||||
for (int i = 0; i < text.size() && i < m_align; ++i) {
|
for (int i = 0; i < text.size() && i < m_align; ++i) {
|
||||||
const QChar c = text.at(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);
|
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()]);
|
painter.drawStaticText(location, m_staticLatin1[c.cell()]);
|
||||||
} else {
|
} else {
|
||||||
painter.drawText(location, c);
|
painter.drawText(location, c);
|
||||||
|
|
Loading…
Reference in New Issue