diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-02-04 12:31:48 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-08 14:33:22 +0000 |
| commit | c834aefa773a11da63f50456436ea49088f6306c (patch) | |
| tree | 91d78b63e17a68be20f4f9309c3fe0ae829384a7 /src | |
| parent | b5ff6da096f0f52a158dcfe5c70fb9e8422e96df (diff) | |
Fix compiler warnings for QFontMetrics use
Change-Id: I4c416280cef8c316258817184e94962c250370da
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit d6b9200e329281269ad8c74177f2b2621798ae56)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/styles/android/qandroidstyle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 |