diff options
| -rw-r--r-- | src/widgets/kernel/qapplication.cpp | 3 | ||||
| -rw-r--r-- | src/widgets/kernel/qapplication.h | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index be37182ccd..41b3dd9aca 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -1559,7 +1559,9 @@ QWidget *QApplication::activeWindow() return QApplicationPrivate::active_window; } +#if QT_DEPRECATED_SINCE(6,0) /*! + \obsolete Use the QFontMetricsF constructor instead Returns display (screen) font metrics for the application font. \sa font(), setFont(), QWidget::fontMetrics(), QPainter::fontMetrics() @@ -1569,6 +1571,7 @@ QFontMetrics QApplication::fontMetrics() { return QApplicationPrivate::desktop()->fontMetrics(); } +#endif bool QApplicationPrivate::tryCloseAllWidgetWindows(QWindowList *processedWindows) { diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h index 52304c637a..f5645b0a11 100644 --- a/src/widgets/kernel/qapplication.h +++ b/src/widgets/kernel/qapplication.h @@ -100,7 +100,11 @@ public: static QFont font(const QWidget*); static QFont font(const char *className); 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.") static QFontMetrics fontMetrics(); +#endif static QWidgetList allWidgets(); static QWidgetList topLevelWidgets(); |