diff widgets/TextAbbrev.cpp @ 1486:ac0a8addabcf

Merge from branch by-id

--- a/widgets/TextAbbrev.cpp	Thu Jun 13 15:35:01 2019 +0100
+++ b/widgets/TextAbbrev.cpp	Wed Jul 17 14:25:16 2019 +0100
@@ -38,6 +38,11 @@
 int
 TextAbbrev::getFuzzWidth(const QFontMetrics &metrics, QString ellipsis)
 {
+    // Qt 5.13 deprecates QFontMetrics::width(), but its suggested
+    // replacement (horizontalAdvance) was only added in Qt 5.11
+    // which is too new for us
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
     int width = metrics.width(ellipsis);
     return width * 2;
 }