From a68e1b96b804e7677b0afd2cd505d99703360cf6 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Tue, 10 Aug 2021 11:20:38 +0200 Subject: [PATCH] Undeprecate QFont(QString) since this is still useful for many Fixes: QTBUG-95441 Pick-to: 6.2 Change-Id: Ib1f78a5a797c7b7d7eb252a7bfa11b5c003ce0d3 Reviewed-by: Eirik Aavitsland Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/gui/text/qfont.cpp | 4 ---- src/gui/text/qfont.h | 3 --- 2 files changed, 7 deletions(-) diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index eb682388ff..194cccaed9 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -691,10 +691,7 @@ QFont::QFont() { } -#if QT_DEPRECATED_SINCE(6, 2) /*! - \deprecated [6.2] Use the overload taking a QStringList instead. - Constructs a font object with the specified \a family, \a pointSize, \a weight and \a italic settings. @@ -740,7 +737,6 @@ QFont::QFont(const QString &family, int pointSize, int weight, bool italic) d->request.weight = weight; d->request.style = italic ? QFont::StyleItalic : QFont::StyleNormal; } -#endif /*! Constructs a font object with the specified \a families, \a diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h index 72c65f6274..1e1b97667f 100644 --- a/src/gui/text/qfont.h +++ b/src/gui/text/qfont.h @@ -168,10 +168,7 @@ public: QFont(); -#if QT_DEPRECATED_SINCE(6, 2) - QT_DEPRECATED_VERSION_X_6_2("Pass QStringList{family} or family.split(QLatin1Char(',')) instead of family") QFont(const QString &family, int pointSize = -1, int weight = -1, bool italic = false); -#endif explicit QFont(const QStringList &families, int pointSize = -1, int weight = -1, bool italic = false); QFont(const QFont &font, const QPaintDevice *pd); QFont(const QFont &font);