diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-03-25 10:32:27 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-03-25 13:07:30 +0000 |
| commit | 57c7b374822cb4c2f47f47724824f682e64f3c0d (patch) | |
| tree | 60ac573503fd4f80b6f6d2ab2f920f7a507a8681 | |
| parent | 5fc0ebf6a74dd541ea102cb26ec2743bcdacfd75 (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.
Change-Id: Id71ea1ebab6f7a385c8c3f286a35f88ba1177857
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
(cherry picked from commit 42e659b3205871649c921873365606b9f7b3f924)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -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 |