summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfont.cpp
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2012-08-24 12:47:21 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-25 19:04:56 +0200
commit1349299f458f41fdc9e7ac4a0592eaa358d2b033 (patch)
tree9104a3d7a9e35f06c6b7845837df85bc027ce278 /src/gui/text/qfont.cpp
parent72a7c43e90917afd57564b881499322e92bbe78d (diff)
doc: Fix several text-related qdoc warnings
Also adds a new snippet which is just copy-pasted from the old documentation, because the snippet-file previously referenced seems to have disappeared. Change-Id: I0180715544321e076acda769cbdcbf19d50a971b Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/gui/text/qfont.cpp')
-rw-r--r--src/gui/text/qfont.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index 20ba367e26..7f5ed7eda3 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -489,7 +489,7 @@ QFontEngineData::~QFontEngineData()
Information on encodings can be found from
\l{Roman Czyborra's} page.
- \sa QFontComboBox, QFontMetrics, QFontInfo, QFontDatabase, {Character Map Example}
+ \sa QFontMetrics, QFontInfo, QFontDatabase, {Character Map Example}
*/
/*!
@@ -786,8 +786,8 @@ QString QFont::styleName() const
/*!
\since 4.8
- Sets the style name of the font. When set, other style properties
- like \a style() and \a weight() will be ignored for font matching.
+ Sets the style name of the font to \a styleName. When set, other style properties
+ like \l style() and \l weight() will be ignored for font matching.
\sa styleName()
*/