summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfont.cpp
diff options
context:
space:
mode:
authorJanne Koskinen <janne.p.koskinen@digia.com>2010-04-08 13:11:44 +0300
committerJanne Koskinen <janne.p.koskinen@digia.com>2010-04-08 13:11:44 +0300
commit3c546be51dbdc1064a14cfcd178f7fbb5c6bff75 (patch)
treeef71de22ce4aa42726c2715b2bac42fe3f6646fb /src/gui/text/qfont.cpp
parent4c425feb08cd4aad31a99e92fec3fbbde0349d95 (diff)
parentd248e431e259cdb31c7634507a09a9f6d39711c3 (diff)
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Diffstat (limited to 'src/gui/text/qfont.cpp')
-rw-r--r--src/gui/text/qfont.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index c221e55dda..cb16a16b1c 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -1297,6 +1297,8 @@ QFont::StyleHint QFont::styleHint() const
\value PreferQuality prefer the best quality font. The font matcher
will use the nearest standard point size that the font
supports.
+ \value ForceIntegerMetrics forces the use of integer values in font engines that support fractional
+ font metrics.
*/
/*!