diff options
| author | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-03-25 13:07:20 +0000 |
|---|---|---|
| committer | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-03-25 13:07:20 +0000 |
| commit | 2d4699501b0943eb44b24b6087230115301445ca (patch) | |
| tree | 963b638dcfcf2d2a084cecddac1b5feddc36bb0e /src/gui | |
| parent | 5fb347c93daabfb6ab554fa6f8a08a6d02c64cc2 (diff) | |
| parent | 42e659b3205871649c921873365606b9f7b3f924 (diff) | |
Merge integration refs/builds/qtci/dev/1616666973
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qtextformat.cpp | 2 | ||||
| -rw-r--r-- | src/gui/text/qtextformat.h | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp index 985209473c..44986c337c 100644 --- a/src/gui/text/qtextformat.cpp +++ b/src/gui/text/qtextformat.cpp @@ -1457,6 +1457,7 @@ QTextCharFormat::QTextCharFormat(const QTextFormat &fmt) /*! \fn void QTextCharFormat::setFontFamily(const QString &family) + \obsolete Use setFontFamilies() instead. Sets the text format's font \a family. @@ -1466,6 +1467,7 @@ QTextCharFormat::QTextCharFormat(const QTextFormat &fmt) /*! \fn QString QTextCharFormat::fontFamily() const + \obsolete Use fontFamilies() instead. Returns the text format's font family. diff --git a/src/gui/text/qtextformat.h b/src/gui/text/qtextformat.h index 9cdd34be2c..b297862b6f 100644 --- a/src/gui/text/qtextformat.h +++ b/src/gui/text/qtextformat.h @@ -456,10 +456,10 @@ public: void setFont(const QFont &font, FontPropertiesInheritanceBehavior behavior = FontPropertiesAll); QFont font() const; -#if QT_DEPRECATED_SINCE(6, 0) - QT_DEPRECATED_VERSION_X_6_0("Use setFontFamilies instead") inline void setFontFamily(const QString &family) +#if QT_DEPRECATED_SINCE(6, 1) + QT_DEPRECATED_VERSION_X_6_1("Use setFontFamilies instead") inline void setFontFamily(const QString &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(); } #endif |