diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-16 11:29:33 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-16 11:29:33 (GMT) |
| commit | 7efd63b1ad26090ec15e1ab7bd9c60fa1c12e98a (patch) | |
| tree | 70d18fe3ca5ac8e53410fc2b62d08fa80d88e09a /src/gui/text/qfont.cpp | |
| parent | 26bc8a57fd35a106dad115b842a18cb971df4cd0 (diff) | |
| parent | 540222f0d936a48f57ed36496fcb211cc437cb1b (diff) | |
| download | Qt-7efd63b1ad26090ec15e1ab7bd9c60fa1c12e98a.zip Qt-7efd63b1ad26090ec15e1ab7bd9c60fa1c12e98a.tar.gz Qt-7efd63b1ad26090ec15e1ab7bd9c60fa1c12e98a.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team:
Doc: Fixed qdoc warnings.
Doc: Fixed qdoc warnings.
Diffstat (limited to 'src/gui/text/qfont.cpp')
| -rw-r--r-- | src/gui/text/qfont.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index 2d6af3b..2df88e2 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -919,8 +919,9 @@ 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 the given \a styleName. + When set, other style properties like style() and weight() will be ignored + for font matching. \sa styleName() */ |