From d6b9200e329281269ad8c74177f2b2621798ae56 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Thu, 4 Feb 2021 12:31:48 +0200 Subject: Fix compiler warnings for QFontMetrics use Pick-to: 6.1 6.0 Change-Id: I4c416280cef8c316258817184e94962c250370da Reviewed-by: Volker Hilsheimer --- src/plugins/styles/android/qandroidstyle.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/styles') diff --git a/src/plugins/styles/android/qandroidstyle.cpp b/src/plugins/styles/android/qandroidstyle.cpp index 1baf568fa9..63c5767126 100644 --- a/src/plugins/styles/android/qandroidstyle.cpp +++ b/src/plugins/styles/android/qandroidstyle.cpp @@ -607,7 +607,7 @@ QSize QAndroidStyle::sizeFromContents(ContentsType ct, if (qApp->styleSheet().isEmpty()) txt = hdr->fontMetrics.size(0, hdr->text); else - txt = qApp->fontMetrics().size(0, hdr->text); + txt = QFontMetrics(QApplication::font()).size(0, hdr->text); sz.setHeight(margin + qMax(iconSize, txt.height()) + margin); sz.setWidth((nullIcon ? 0 : margin) + iconSize -- cgit v1.2.3