diff options
author | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-01 11:44:26 +0300 |
---|---|---|
committer | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-01 11:44:27 +0300 |
commit | 0ab63b035a649dc1982c867cd37d466d249004b9 (patch) | |
tree | 6de22edcd3957aae3eee698136a000e52ab7f8fe /src/gui/text/qfont.cpp | |
parent | a6f8aa0ae1d5a1d1099df1891ea60b14b6eb6065 (diff) | |
parent | 0cb2c760c219514849ab0f6be8e5368f92dfa5d9 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I2a6eb9dd7724931bc89f28bcc156e77c4e26d069
Diffstat (limited to 'src/gui/text/qfont.cpp')
-rw-r--r-- | src/gui/text/qfont.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index 0fffa608a4..1797905e93 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -546,6 +546,7 @@ QFontEngineData::~QFontEngineData() /*! \fn QString QFont::rawName() const + \deprecated Returns the name of the font within the underlying window system. @@ -559,6 +560,7 @@ QFontEngineData::~QFontEngineData() /*! \fn void QFont::setRawName(const QString &name) + \deprecated Sets a font by its system specific name. @@ -1106,7 +1108,7 @@ int QFont::weight() const Qt uses a weighting scale from 0 to 99 similar to, but not the same as, the scales used in Windows or CSS. A weight of 0 is - ultralight, whilst 99 will be an extremely black. + ultralight, whilst 99 will be extremely black. This enum contains the predefined font weights: @@ -1282,7 +1284,7 @@ bool QFont::kerning() const When kerning is enabled, glyph metrics do not add up anymore, even for Latin text. In other words, the assumption that width('a') + width('b') is equal to width("ab") is not - neccesairly true. + necessarily true. \sa kerning(), QFontMetrics */ @@ -2420,7 +2422,7 @@ QString QFontInfo::family() const \since 4.8 Returns the style name of the matched window system font on - system that supports it. + systems that support it. \sa QFont::styleName() */ |