1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Doc: Improve deprecation description for QApplication::fontMetrics()

Browse Source 
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.8 6.5 6.2
Change-Id: Ib5713a9d39bf312a6eae6b8b1a6d1dc1d47e25be
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
(cherry picked from commit bdf453afd7613d3e88099defb759444537527195)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Andreas Eliasson 2025-02-04 07:05:59 +01:00 committed by Qt Cherry-pick Bot
parent 593f69a861
commit f87929371a
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/widgets/kernel/qapplication.cpp
View File

@ -1566,14 +1566,18 @@ QWidget *QApplication::activeWindow()
return QApplicationPrivate::active_window; return QApplicationPrivate::active_window;
} }
#if QT_DEPRECATED_SINCE(6,0)
/*! /*!
\deprecated Use the QFontMetricsF constructor instead. \fn QFontMetrics QApplication::fontMetrics()
Returns display (screen) font metrics for the application font. \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() \sa font(), setFont(), QWidget::fontMetrics(), QPainter::fontMetrics()
*/ */
#if QT_DEPRECATED_SINCE(6,0)
QFontMetrics QApplication::fontMetrics() QFontMetrics QApplication::fontMetrics()
{ {
return QApplicationPrivate::desktop()->fontMetrics(); return QApplicationPrivate::desktop()->fontMetrics();

2
src/widgets/kernel/qapplication.h
View File

@ -66,7 +66,7 @@ public:
static void setFont(const QFont &, const char* className = nullptr); static void setFont(const QFont &, const char* className = nullptr);
#if QT_DEPRECATED_SINCE(6,0) #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(); static QFontMetrics fontMetrics();
#endif #endif