From 1ca4cad6135f7358898100ce19b37e2e10c1b49d Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Tue, 13 Mar 2012 17:10:23 +0100
Subject: [PATCH] Compile with Qt 5 (QFontMetrics constructor explicit).
Change-Id: Idd695326b4b3e162e2b691b3df0a5a4bfbff2fe6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---
src/plugins/valgrind/callgrindtextmark.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/plugins/valgrind/callgrindtextmark.cpp b/src/plugins/valgrind/callgrindtextmark.cpp
index aa524442d9e..b6b3d6fd67e 100644
--- a/src/plugins/valgrind/callgrindtextmark.cpp
+++ b/src/plugins/valgrind/callgrindtextmark.cpp
@@ -80,10 +80,10 @@ void CallgrindTextMark::paint(QPainter *painter, const QRect &paintRect) const
// decrease font size if paint rect is too small (very unlikely, but may happen)
QFont font = painter->font();
- QFontMetrics fm = font;
+ QFontMetrics fm = QFontMetrics(font);
while (fm.boundingRect(text).width() > paintRect.width()) {
font.setPointSize(font.pointSize() - 1);
- fm = font;
+ fm = QFontMetrics(font);
}
painter->setFont(font);
--
GitLab