Mercurial > hg > svgui

diff layer/PaintAssistant.cpp @ 1486:ac0a8addabcf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch by-id
author Chris Cannam
date Wed, 17 Jul 2019 14:25:16 +0100
parents f2525e6cbdf1
children
line wrap: on
line diff
--- a/layer/PaintAssistant.cpp	Thu Jun 13 15:35:01 2019 +0100
+++ b/layer/PaintAssistant.cpp	Wed Jul 17 14:25:16 2019 +0100
@@ -114,6 +114,11 @@
         
         if (spaceForLabel) {
             
+            // 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 tx = 3;
             if (paint.fontMetrics().width(text) < w - 10) {
                 tx = w - 10 - paint.fontMetrics().width(text);