AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Doc: Fix docs for QFontMetrics::height() to match code

Browse Source 
After cb8445f032, 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 <ritt.ks@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Eskil Abrahamsen Blomfeldt 2014-06-17 09:27:10 +02:00
parent 242fbc33a3
commit 0f2ed80a0c
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/text/qfontmetrics.cpp
View File

@ -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()
*/