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

Merge integration refs/builds/qtci/dev/1616666973

Browse Source
This commit is contained in:
Qt CI Bot 2021-03-25 13:07:20 +00:00
commit 2d4699501b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/text/qtextformat.cpp
View File

@ -1457,6 +1457,7 @@ QTextCharFormat::QTextCharFormat(const QTextFormat &fmt)
/*! /*!
\fn void QTextCharFormat::setFontFamily(const QString &family) \fn void QTextCharFormat::setFontFamily(const QString &family)
\obsolete Use setFontFamilies() instead.
Sets the text format's font \a family. Sets the text format's font \a family.
@ -1466,6 +1467,7 @@ QTextCharFormat::QTextCharFormat(const QTextFormat &fmt)
/*! /*!
\fn QString QTextCharFormat::fontFamily() const \fn QString QTextCharFormat::fontFamily() const
\obsolete Use fontFamilies() instead.
Returns the text format's font family. Returns the text format's font family.

6
src/gui/text/qtextformat.h
View File

@ -456,10 +456,10 @@ public:
void setFont(const QFont &font, FontPropertiesInheritanceBehavior behavior = FontPropertiesAll); void setFont(const QFont &font, FontPropertiesInheritanceBehavior behavior = FontPropertiesAll);
QFont font() const; QFont font() const;
#if QT_DEPRECATED_SINCE(6, 0) #if QT_DEPRECATED_SINCE(6, 1)
QT_DEPRECATED_VERSION_X_6_0("Use setFontFamilies instead") inline void setFontFamily(const QString &family) QT_DEPRECATED_VERSION_X_6_1("Use setFontFamilies instead") inline void setFontFamily(const QString &family)
{ setProperty(FontFamilies, QVariant(QStringList(family))); } { setProperty(FontFamilies, QVariant(QStringList(family))); }
QT_DEPRECATED_VERSION_X_6_0("Use fontFamilies instead") inline QString fontFamily() const QT_DEPRECATED_VERSION_X_6_1("Use fontFamilies instead") inline QString fontFamily() const
{ return property(FontFamilies).toStringList().first(); } { return property(FontFamilies).toStringList().first(); }
#endif #endif