[QFontMetrics] Mark obsolete charWidth() method for deletion in 6.0

It was obsoleted for quite a while already and we forgot to get rid
of it the last time.

Change-Id: Ib15e71829e80648aa667a6b0af31698460b99cc1
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>

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

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;