From 8cccf0a76b82726ce987690d783a1b912aa6bba5 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 8 Jun 2020 16:50:01 +0200 Subject: Remove deprecated methods and address some ### Qt 6 comments in gui/text Change-Id: If1ed58ecbb13df88bdb1d72caccfd01c14d42eac Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/gui/text/qtextformat.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/gui/text/qtextformat.h') diff --git a/src/gui/text/qtextformat.h b/src/gui/text/qtextformat.h index b4db18289e..a6d1bf1d57 100644 --- a/src/gui/text/qtextformat.h +++ b/src/gui/text/qtextformat.h @@ -449,8 +449,7 @@ public: FontPropertiesSpecifiedOnly, FontPropertiesAll }; - void setFont(const QFont &font, FontPropertiesInheritanceBehavior behavior); - void setFont(const QFont &font); // ### Qt6: Merge with above + void setFont(const QFont &font, FontPropertiesInheritanceBehavior behavior = FontPropertiesAll); QFont font() const; inline void setFontFamily(const QString &family) @@ -580,14 +579,6 @@ public: inline QString anchorHref() const { return stringProperty(AnchorHref); } -#if QT_DEPRECATED_SINCE(5, 13) - QT_DEPRECATED_X("Use setAnchorNames() instead") - inline void setAnchorName(const QString &name) - { setAnchorNames(QStringList(name)); } - QT_DEPRECATED_X("Use anchorNames() instead") - QString anchorName() const; -#endif - inline void setAnchorNames(const QStringList &names) { setProperty(AnchorName, names); } QStringList anchorNames() const; -- cgit v1.2.3