From 681fccd5e6e5b2e48c0ffa1fd67880136365e531 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Thu, 17 Dec 2020 13:05:17 +1000 Subject: [PATCH] Qt: Fix compilation on Qt <5.11 --- src/duckstation-qt/memoryviewwidget.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/duckstation-qt/memoryviewwidget.cpp b/src/duckstation-qt/memoryviewwidget.cpp index 15dc14f99..86d7a849e 100644 --- a/src/duckstation-qt/memoryviewwidget.cpp +++ b/src/duckstation-qt/memoryviewwidget.cpp @@ -37,8 +37,13 @@ int MemoryViewWidget::asciiWidth() const void MemoryViewWidget::updateMetrics() { - m_char_width = fontMetrics().horizontalAdvance(QChar('0')); - m_char_height = fontMetrics().height(); + const QFontMetrics fm(fontMetrics()); +#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0) + m_char_width = fm.horizontalAdvance(QChar('0')); +#else + m_char_width = fm.boundingRect(QChar('0')).width(); +#endif + m_char_height = fm.height(); } void MemoryViewWidget::setData(size_t address_offset, const void* data_ptr, size_t data_size)