From 2b7232c9b39d76bf997e2f1c4271912957e69cff Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Tue, 6 Aug 2019 22:36:27 +0200 Subject: [PATCH] Replace deprecated function call QFontMetrics::width() has been deprecated. Using QFontMetrics::horizontalAdvance() is the proper way to go (introduce in Qt 5.11). --- src/ElidingLabel.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/ElidingLabel.cpp b/src/ElidingLabel.cpp index 8e6ea56..4849da0 100644 --- a/src/ElidingLabel.cpp +++ b/src/ElidingLabel.cpp @@ -157,7 +157,11 @@ QSize CElidingLabel::minimumSizeHint() const return QLabel::minimumSizeHint(); } const QFontMetrics &fm = fontMetrics(); - QSize size(fm.width(d->Text.left(2) + "…"), fm.height()); + #if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)) + QSize size(fm.horizontalAdvance(d->Text), QLabel::sizeHint().height()); + #else + QSize size(fm.width(d->Text), QLabel::sizeHint().height()); + #endif return size; } @@ -170,7 +174,11 @@ QSize CElidingLabel::sizeHint() const return QLabel::sizeHint(); } const QFontMetrics& fm = fontMetrics(); - QSize size(fm.width(d->Text), QLabel::sizeHint().height()); + #if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)) + QSize size(fm.horizontalAdvance(d->Text), QLabel::sizeHint().height()); + #else + QSize size(fm.width(d->Text), QLabel::sizeHint().height()); + #endif return size; }