comparison layer/LinearColourScale.cpp @ 1486:ac0a8addabcf

Merge from branch by-id

 
 int
 LinearColourScale::getWidth(LayerGeometryProvider *,
                             QPainter &paint)
 {
+    // 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"
+
     return paint.fontMetrics().width("-000.00") + 15;
 }
 
 void
 LinearColourScale::paintVertical(LayerGeometryProvider *v,