From 0f2ed80a0cfd0442fd5ea1fc1fd4a76ffb8a162a Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Tue, 17 Jun 2014 09:27:10 +0200 Subject: Doc: Fix docs for QFontMetrics::height() to match code After cb8445f0323b0eefbb04f1d8adad81a00b53abd8, Qt no longer considers the baseline to have a vertical size, so it does not add an extra pixel to the font height. The documentation needs to be updated to reflect this. Task-number: QTBUG-39668 Change-Id: I28fc813e21d73bb03f7055b0f0843511a12d308b Reviewed-by: Konstantin Ritt Reviewed-by: Friedemann Kleint --- src/gui/text/qfontmetrics.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/gui/text') diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp index 7868fd23d1..f6ab123739 100644 --- a/src/gui/text/qfontmetrics.cpp +++ b/src/gui/text/qfontmetrics.cpp @@ -295,8 +295,7 @@ int QFontMetrics::descent() const /*! Returns the height of the font. - This is always equal to ascent()+descent()+1 (the 1 is for the - base line). + This is always equal to ascent()+descent(). \sa leading(), lineSpacing() */ @@ -1159,8 +1158,7 @@ qreal QFontMetricsF::descent() const /*! Returns the height of the font. - This is always equal to ascent()+descent()+1 (the 1 is for the - base line). + This is always equal to ascent()+descent(). \sa leading(), lineSpacing() */ -- cgit v1.2.3