diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-02-11 10:32:46 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-02-15 15:12:02 +0000 |
commit | ec6b38dea0a9c7f5b2b45dff6cbb2b1479f44878 (patch) | |
tree | 00a9e1596699485c20f34ba8300981f4c726d4ed /src/plugins/diffeditor | |
parent | 6eac37a7d93396f03f00f00135e06a82cdda1cf4 (diff) | |
download | qt-creator-ec6b38dea0a9c7f5b2b45dff6cbb2b1479f44878.tar.gz |
Fix Qt 5.13 deprecation warning about QFontMetrics::width()
Replace by QFontMetrics::horizontalAdvance(), fixing:
warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated:
Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations]
Change-Id: I9991ffefe6e87e872dc35ba291d562e06b28ca64
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src/plugins/diffeditor')
-rw-r--r-- | src/plugins/diffeditor/sidebysidediffeditorwidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp index 0975273ee2..c63d969519 100644 --- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp +++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp @@ -401,7 +401,7 @@ void SideDiffEditorWidget::paintSeparator(QPainter &painter, painter.setPen(foreground); const QString replacementText = " {" + foldReplacementText(block) + "}; "; - const int replacementTextWidth = fontMetrics().width(replacementText) + 24; + const int replacementTextWidth = fontMetrics().horizontalAdvance(replacementText) + 24; int x = replacementTextWidth + int(offset.x()); if (x < document()->documentMargin() || !TextDocumentLayout::isFolded(block)) { |