AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Undeprecate QFont(QString) since this is still useful for many

Browse Source 
Fixes: QTBUG-95441
Pick-to: 6.2
Change-Id: Ib1f78a5a797c7b7d7eb252a7bfa11b5c003ce0d3
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
This commit is contained in:
Andy Shaw 2021-08-10 11:20:38 +02:00
parent 58e32ae198
commit a68e1b96b8
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/text/qfont.cpp
View File

@ -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

3
src/gui/text/qfont.h
View File

@ -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);