diff options
author | Tobias C. Berner <tcberner@FreeBSD.org> | 2019-10-01 04:13:31 +0000 |
---|---|---|
committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2019-10-01 04:13:31 +0000 |
commit | c45de9579f6ec97574056dd335df02031ccd00ad (patch) | |
tree | bf42b7c476faa7a6183d0feaa4c65bb90053847d /net-im/qTox/files/patch-git-b45ba34be250e938c6b07617e121d789ed52ca1d | |
parent | irc/py-limnoria: Backport Web plugin bugfixes (diff) |
Qt5 update to 5.13.0
For new features, check: https://wiki.qt.io/New_Features_in_Qt_5.13
Thanks to adridg who helped to fix a lot of packages.
Exp-run by: antoine
PR: 238782
Notes
Notes:
svn path=/head/; revision=513447
Diffstat (limited to 'net-im/qTox/files/patch-git-b45ba34be250e938c6b07617e121d789ed52ca1d')
-rw-r--r-- | net-im/qTox/files/patch-git-b45ba34be250e938c6b07617e121d789ed52ca1d | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/net-im/qTox/files/patch-git-b45ba34be250e938c6b07617e121d789ed52ca1d b/net-im/qTox/files/patch-git-b45ba34be250e938c6b07617e121d789ed52ca1d new file mode 100644 index 000000000000..10479f719345 --- /dev/null +++ b/net-im/qTox/files/patch-git-b45ba34be250e938c6b07617e121d789ed52ca1d @@ -0,0 +1,38 @@ +diff --git src/widget/tool/croppinglabel.cpp src/widget/tool/croppinglabel.cpp +index 0b12840a..d4364361 100644 +--- src/widget/tool/croppinglabel.cpp ++++ src/widget/tool/croppinglabel.cpp +@@ -36,8 +36,7 @@ CroppingLabel::CroppingLabel(QWidget* parent) + public: + explicit LineEdit(QWidget* parent = nullptr) + : QLineEdit(parent) +- { +- } ++ {} + + protected: + void keyPressEvent(QKeyEvent* event) override +@@ -106,7 +105,11 @@ QSize CroppingLabel::sizeHint() const + + QSize CroppingLabel::minimumSizeHint() const + { ++#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)) ++ return QSize(fontMetrics().horizontalAdvance("..."), QLabel::minimumSizeHint().height()); ++#else + return QSize(fontMetrics().width("..."), QLabel::minimumSizeHint().height()); ++#endif + } + + void CroppingLabel::mouseReleaseEvent(QMouseEvent* e) +@@ -171,7 +174,11 @@ void CroppingLabel::minimizeMaximumWidth() + { + // This function chooses the smallest possible maximum width. + // Text width + padding. Without padding, we'll have elipses. ++#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)) ++ setMaximumWidth(fontMetrics().horizontalAdvance(origText) + fontMetrics().horizontalAdvance("...")); ++#else + setMaximumWidth(fontMetrics().width(origText) + fontMetrics().width("...")); ++#endif + } + + void CroppingLabel::editingFinished() |