summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontdatabase.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/qfontdatabase.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/qfontdatabase.cpp')
-rw-r--r--src/gui/text/qfontdatabase.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index 1d4eaa5576..b429fbd910 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -1203,7 +1203,7 @@ QString QFontDatabase::styleString(const QFontInfo &fontInfo)
each combination of family and style, displaying this information
in a tree view.
- \sa QFont, QFontInfo, QFontMetrics, QFontComboBox, {Character Map Example}
+ \sa QFont, QFontInfo, QFontMetrics, {Character Map Example}
*/
/*!
@@ -1526,7 +1526,7 @@ bool QFontDatabase::isScalable(const QString &family,
/*!
Returns a list of the point sizes available for the font that has
- family \a family and style \a style. The list may be empty.
+ family \a family and style \a styleName. The list may be empty.
\sa smoothSizes(), standardSizes()
*/
@@ -1627,7 +1627,7 @@ QFont QFontDatabase::font(const QString &family, const QString &style,
/*!
Returns the point sizes of a font that has family \a family and
- style \a style that will look attractive. The list may be empty.
+ style \a styleName that will look attractive. The list may be empty.
For non-scalable fonts and bitmap scalable fonts, this function
is equivalent to pointSizes().