diff options
author | David Boddie <dboddie@trolltech.com> | 2009-12-07 14:59:20 (GMT) |
---|---|---|
committer | David Boddie <dboddie@trolltech.com> | 2009-12-07 14:59:20 (GMT) |
commit | 74b0c482b1edf606e1326c9053c612a7e514dee4 (patch) | |
tree | 168d18966546e21cce36195bda776ef06335a91b | |
parent | 0ec20e4fdd70dc11df5932ea2c282efce21dee15 (diff) | |
download | Qt-74b0c482b1edf606e1326c9053c612a7e514dee4.zip Qt-74b0c482b1edf606e1326c9053c612a7e514dee4.tar.gz Qt-74b0c482b1edf606e1326c9053c612a7e514dee4.tar.bz2 |
Doc: Fixed references to "old" 2.x and "new" 3.x font name conventions.
Reviewed-by: Trust Me
As-reported-by: Eskil
-rw-r--r-- | src/gui/text/qfontdatabase.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index 7e93aa0..e9c7b89 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -1482,13 +1482,13 @@ QString QFontDatabase::styleString(const QFontInfo &fontInfo) and style will look attractive. If the font family is available from two or more foundries the - foundry name is included in the family name, e.g. "Helvetica - [Adobe]" and "Helvetica [Cronyx]". When you specify a family you - can either use the old hyphenated Qt 2.x "foundry-family" format, - e.g. "Cronyx-Helvetica", or the new bracketed Qt 3.x "family - [foundry]" format e.g. "Helvetica [Cronyx]". If the family has a - foundry it is always returned, e.g. by families(), using the - bracketed format. + foundry name is included in the family name; for example: + "Helvetica [Adobe]" and "Helvetica [Cronyx]". When you specify a + family, you can either use the old hyphenated "foundry-family" + format or the bracketed "family [foundry]" format; for example: + "Cronyx-Helvetica" or "Helvetica [Cronyx]". If the family has a + foundry it is always returned using the bracketed format, as is + the case with the value returned by families(). The font() function returns a QFont given a family, style and point size. |