diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -68,6 +68,15 @@ namespace GUIUtil { +auto PortableQtWidthFunction = [](const QFontMetrics &metrics, + const QString &text) { +#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)) + return metrics.horizontalAdvance(text); +#else + return metrics.width(text); +#endif +}; + QString dateTimeStr(const QDateTime &date) { return date.date().toString(Qt::SystemLocaleShortDate) + QString(" ") + date.toString("hh:mm"); @@ -954,7 +963,7 @@ while (font_size >= minPointSize) { font.setPointSizeF(font_size); QFontMetrics fm(font); - if (fm.horizontalAdvance(text) < width) { + if (PortableQtWidthFunction(fm, text) < width) { break; } font_size -= 0.5; @@ -980,11 +989,7 @@ } int TextWidth(const QFontMetrics &fm, const QString &text) { -#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)) - return fm.horizontalAdvance(text); -#else - return fm.width(text); -#endif + return PortableQtWidthFunction(fm, text); } void PolishProgressDialog(QProgressDialog *dialog) {