Merge origin/master and fix conflicts

1 files changed, 2 insertions, 13 deletions

diff --git a/src/ui/InfoMessage.cpp b/src/ui/InfoMessage.cpp

index fb3b306a..ebe0e63f 100644
--- a/src/ui/InfoMessage.cpp
+++ b/src/ui/InfoMessage.cpp
@@ -29,13 +29,7 @@ InfoMessage::InfoMessage(QString msg, QWidget *parent)
         initFont();
 
         QFontMetrics fm{font()};
-#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
-        // width deprecated in 5.13
-        width_ = fm.width(msg_) + HPadding * 2;
-#else
-        width_ = fm.horizontalAdvance(msg_) + HPadding * 2;
-#endif
-
+        width_  = fm.horizontalAdvance(msg_) + HPadding * 2;
         height_ = fm.ascent() + 2 * VPadding;
 
         setFixedHeight(height_ + 2 * HMargin);
@@ -77,12 +71,7 @@ DateSeparator::DateSeparator(QDateTime datetime, QWidget *parent)
         msg_ = datetime.date().toString(fmt);
 
         QFontMetrics fm{font()};
-#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
-        // width deprecated in 5.13
-        width_ = fm.width(msg_) + HPadding * 2;
-#else
-        width_ = fm.horizontalAdvance(msg_) + HPadding * 2;
-#endif
+        width_  = fm.horizontalAdvance(msg_) + HPadding * 2;
         height_ = fm.ascent() + 2 * VPadding;
 
         setFixedHeight(height_ + 2 * HMargin);