Qt5: 'int QFontMetrics::width' is deprecated since Qt 5.11: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations]

This commit is contained in:
wmayer
2020-06-10 12:27:50 +02:00
committed by wwmayer
parent db3f9008c0
commit 1ee3d79d7c
21 changed files with 107 additions and 29 deletions

View File

@@ -58,6 +58,7 @@
#include "Application.h"
#include "Document.h"
#include "Window.h"
#include "Tools.h"
using namespace Gui;
@@ -493,7 +494,7 @@ void ViewProviderAnnotationLabel::drawImage(const std::vector<std::string>& s)
QStringList lines;
for (std::vector<std::string>::const_iterator it = s.begin(); it != s.end(); ++it) {
QString line = QString::fromUtf8(it->c_str());
w = std::max<int>(w, fm.width(line));
w = std::max<int>(w, QtTools::horizontalAdvance(fm, line));
lines << line;
}