diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2019-01-10 11:11:52 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-01-15 11:46:56 +0000 |
commit | cacf2ad9229a6842dbc0e002ed8ba4d04db026ae (patch) | |
tree | a08fe695a25961617424bd37762c55e577022c6a | |
parent | 8c47c2a08ec69fe45a14f6c2334befcb2e074790 (diff) |
Fix deprecation warnings about QFontMetrics::width
Recommend QFontMetrics::horizontalAdvance not QFont::horizontalAdvance
Amends c2bf0cac957b1e7866538201433f3cd38313ab7f
Change-Id: I7699acb7855fcff2297507343851b42b14d0f7f6
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
-rw-r--r-- | src/gui/text/qfontmetrics.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/text/qfontmetrics.h b/src/gui/text/qfontmetrics.h index cbccc886fd..61931fa9bc 100644 --- a/src/gui/text/qfontmetrics.h +++ b/src/gui/text/qfontmetrics.h @@ -104,11 +104,11 @@ public: int rightBearing(QChar) const; #if QT_DEPRECATED_SINCE(5, 11) - QT_DEPRECATED_X("Use QFont::horizontalAdvance") + QT_DEPRECATED_X("Use QFontMetrics::horizontalAdvance") int width(const QString &, int len = -1) const; - QT_DEPRECATED_X("Use QFont::horizontalAdvance") + QT_DEPRECATED_X("Use QFontMetrics::horizontalAdvance") int width(const QString &, int len, int flags) const; - QT_DEPRECATED_X("Use QFont::horizontalAdvance") + QT_DEPRECATED_X("Use QFontMetrics::horizontalAdvance") int width(QChar) const; #endif |