diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-03-25 10:32:27 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-03-25 11:08:21 +0100 |
| commit | 42e659b3205871649c921873365606b9f7b3f924 (patch) | |
| tree | db979af3be7901b49a9d21ecb53655f80ec1687b /src/gui/text/qtextformat.h | |
| parent | 3dcdd89dd158306784159d673a1be76a32036b14 (diff) | |
Fix deprecated macros
The QTextCharFormat::fontFamily methods are deprecated as of Qt 6.1,
not as of Qt 6.0.
Mark them as obsolete in the documentation and point to the replacement
there as well.
Address API review comment.
Pick-to: 6.1
Change-Id: Id71ea1ebab6f7a385c8c3f286a35f88ba1177857
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Diffstat (limited to 'src/gui/text/qtextformat.h')
| -rw-r--r-- | src/gui/text/qtextformat.h | 6 |
1 files changed, 3 insertions, 3 deletions
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 |