diff options
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/text/qfontmetrics.cpp | 2 | ||||
-rw-r--r-- | src/gui/text/qfontmetrics.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp index c2d4b64152..e351d4d2c5 100644 --- a/src/gui/text/qfontmetrics.cpp +++ b/src/gui/text/qfontmetrics.cpp @@ -582,6 +582,7 @@ int QFontMetrics::width(QChar ch) const return qRound(advance); } +#if QT_VERSION < QT_VERSION_CHECK(6,0,0) /*! \obsolete Returns the width of the character at position \a pos in the @@ -634,6 +635,7 @@ int QFontMetrics::charWidth(const QString &text, int pos) const } return width; } +#endif /*! Returns the bounding rectangle of the characters in the string diff --git a/src/gui/text/qfontmetrics.h b/src/gui/text/qfontmetrics.h index 65ec219a99..2031f022d4 100644 --- a/src/gui/text/qfontmetrics.h +++ b/src/gui/text/qfontmetrics.h @@ -86,7 +86,9 @@ public: int width(const QString &, int len, int flags) const; int width(QChar) const; - int charWidth(const QString &str, int pos) const; +#if QT_VERSION < QT_VERSION_CHECK(6,0,0) + QT_DEPRECATED int charWidth(const QString &str, int pos) const; +#endif QRect boundingRect(QChar) const; |