diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-05-12 16:14:07 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-05-15 18:56:20 +0200 |
| commit | 2b10a192a1b892eb7d67cfb4ac5f1dd6a7f196c9 (patch) | |
| tree | 868e9ab8413cf2d0110ce24f26d988ed58ac4e73 /src/gui/text/qfont.h | |
| parent | 794150e5bda0c203a5373c3fa2f9785f9941f6dd (diff) | |
Remove deprecated method from QFont, QFontMetrics, and QFontInfo
Change-Id: Ifc8fb5c5d53359b33b8abab3bbee3de61bfef539
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/gui/text/qfont.h')
| -rw-r--r-- | src/gui/text/qfont.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h index 6317613b67..06a71e93a9 100644 --- a/src/gui/text/qfont.h +++ b/src/gui/text/qfont.h @@ -249,11 +249,6 @@ public: void setHintingPreference(HintingPreference hintingPreference); HintingPreference hintingPreference() const; -#if QT_DEPRECATED_SINCE(5, 5) - bool rawMode() const; - void setRawMode(bool); -#endif - // dupicated from QFontInfo bool exactMatch() const; @@ -266,12 +261,6 @@ public: inline QFont &operator=(QFont &&other) noexcept { qSwap(d, other.d); qSwap(resolve_mask, other.resolve_mask); return *this; } -#if QT_DEPRECATED_SINCE(5, 3) - // needed for X11 - QT_DEPRECATED void setRawName(const QString &); - QT_DEPRECATED QString rawName() const; -#endif - QString key() const; QString toString() const; @@ -283,18 +272,11 @@ public: static void insertSubstitution(const QString&, const QString &); static void insertSubstitutions(const QString&, const QStringList &); static void removeSubstitutions(const QString &); -#if QT_DEPRECATED_SINCE(5, 0) - static QT_DEPRECATED void removeSubstitution(const QString &family) { removeSubstitutions(family); } -#endif static void initialize(); static void cleanup(); static void cacheStatistics(); QString defaultFamily() const; -#if QT_DEPRECATED_SINCE(5, 13) - QT_DEPRECATED QString lastResortFamily() const; - QT_DEPRECATED QString lastResortFont() const; -#endif QFont resolve(const QFont &) const; inline uint resolve() const { return resolve_mask; } |