diff layer/HorizontalFrequencyScale.cpp @ 1486:ac0a8addabcf

Merge from branch by-id

--- a/layer/HorizontalFrequencyScale.cpp	Thu Jun 13 15:35:01 2019 +0100
+++ b/layer/HorizontalFrequencyScale.cpp	Wed Jul 17 14:25:16 2019 +0100
@@ -56,6 +56,11 @@
     int marginx = -1;
 
     for (int i = 0; i < n; ++i) {
+
+        // 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"
         
         double val = ticks[i].value;
         QString label = QString::fromStdString(ticks[i].label);