diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-02-04 12:31:48 +0200 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-02-04 16:50:45 +0200 |
| commit | d6b9200e329281269ad8c74177f2b2621798ae56 (patch) | |
| tree | 5e38301c7d5ab342140b15351b93748938e79851 /src/plugins/styles | |
| parent | be06164201d7d9ccdbaaff343af2e8f3662c044d (diff) | |
Fix compiler warnings for QFontMetrics use
Pick-to: 6.1 6.0
Change-Id: I4c416280cef8c316258817184e94962c250370da
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/plugins/styles')
| -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 |