diff options
| author | Andreas Eliasson <[email protected]> | 2025-02-04 07:05:59 +0100 |
|---|---|---|
| committer | Andreas Eliasson <[email protected]> | 2025-02-14 13:01:57 +0100 |
| commit | bdf453afd7613d3e88099defb759444537527195 (patch) | |
| tree | 40c44e9692bd9234e4dc1d0bac843ceb47f3fcab | |
| parent | 9b475eadfcf04194a094454f65295c3a456000a4 (diff) | |
Doc: Improve deprecation description for QApplication::fontMetrics()
Add a link to QFontMetrics, which provides more information about the
differences between QFontMetrics and QFontMetricsF and why the latter
is the preferred choice.
Fixes: QTBUG-127528
Pick-to: 6.9 6.8 6.5 6.2
Change-Id: Ib5713a9d39bf312a6eae6b8b1a6d1dc1d47e25be
Reviewed-by: Marcus Tillmanns <[email protected]>
Reviewed-by: Christian Ehrlicher <[email protected]>
| -rw-r--r-- | src/widgets/kernel/qapplication.cpp | 10 | ||||
| -rw-r--r-- | src/widgets/kernel/qapplication.h | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index ab9d7fd98a3..40894c28702 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -1574,14 +1574,18 @@ QWidget *QApplication::activeWindow() return QApplicationPrivate::active_window; } -#if QT_DEPRECATED_SINCE(6,0) /*! - \deprecated Use the QFontMetricsF constructor instead. - Returns display (screen) font metrics for the application font. + \fn QFontMetrics QApplication::fontMetrics() + \deprecated [6.0] Use QFontMetricsF(qApp->font()) instead. + + Returns display (screen) font metrics for the application font. For more + information about the difference between \l QFontMetrics and \l QFontMetricsF, + see the detailed description of \l QFontMetrics. \sa font(), setFont(), QWidget::fontMetrics(), QPainter::fontMetrics() */ +#if QT_DEPRECATED_SINCE(6,0) QFontMetrics QApplication::fontMetrics() { return QApplicationPrivate::desktop()->fontMetrics(); diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h index c54aff4a233..83dfdc50bcd 100644 --- a/src/widgets/kernel/qapplication.h +++ b/src/widgets/kernel/qapplication.h @@ -66,7 +66,7 @@ public: static void setFont(const QFont &, const char* className = nullptr); #if QT_DEPRECATED_SINCE(6,0) - QT_DEPRECATED_VERSION_X_6_0("Use the QFontMetricsF constructor instead.") + QT_DEPRECATED_VERSION_X_6_0("Use QFontMetricsF(qApp->font()) instead.") static QFontMetrics fontMetrics(); #endif |