diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-01-01 17:14:15 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-01-10 02:37:03 +0900 |
| commit | afd53be6f56c9622b4c3d55e6144a82cfa4c1eb1 (patch) | |
| tree | 19eb8ddfeb44674d2547d86606750ff3630c81b5 /desktop-widgets/mainwindow.cpp | |
| parent | 042799eb2a4e94d854b10a9db679e5b050cda38d (diff) | |
| download | subsurface-afd53be6f56c9622b4c3d55e6144a82cfa4c1eb1.tar.gz | |
code cleanup: QFontMetrics::width() is deprecated
Qt5.11 introduced the suggested replacement QFontMetrics::horizontalAdvance().
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'desktop-widgets/mainwindow.cpp')
| -rw-r--r-- | desktop-widgets/mainwindow.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index 3a92656ad..ddb174984 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -97,7 +97,11 @@ extern "C" int updateProgress(const char *text) if (progressDialog) { // apparently we don't always get enough space to show the full label // so let's manually make enough space (but don't shrink the existing size) +#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0) int width = QFontMetrics(qApp->font()).width(text) + 100; +#else // QT 5.11 or newer + int width = QFontMetrics(qApp->font()).horizontalAdvance(text) + 100; +#endif if (width > progressDialog->width()) progressDialog->resize(width + 20, progressDialog->height()); progressDialog->setLabelText(text); |