mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2024-12-25 23:51:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace deprecated function call

Browse Source
This commit is contained in:
Tibo Clausen 2019-09-09 14:05:37 +01:00
parent 6e6c1512a6
commit 53ec8b896a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ElidingLabel.cpp
View File

@ -157,7 +157,11 @@ QSize CElidingLabel::minimumSizeHint() const
return QLabel::minimumSizeHint(); return QLabel::minimumSizeHint();
} }
const QFontMetrics &fm = fontMetrics(); 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.left(2) + "…"), fm.height());
#else
QSize size(fm.width(d->Text.left(2) + "…"), fm.height());
#endif
return size; return size;
} }
@ -170,7 +174,11 @@ QSize CElidingLabel::sizeHint() const
return QLabel::sizeHint(); return QLabel::sizeHint();
} }
const QFontMetrics& fm = fontMetrics(); 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; return size;
} }