diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-06-25 00:18:10 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-27 00:46:35 +0200 |
| commit | 3a8d7b0b9a4db91415b7bda2582a59a76b3754dc (patch) | |
| tree | 61d62e5f474f3e953dfec3f42d0c183fb8705fa1 /src/gui/text/qfont.cpp | |
| parent | 989cada8cc6c4f12e30c28bde3edac8a3833680f (diff) | |
Remove all references to XLFD fonts
XLFD fonts are no longer supported in Qt 5.
Change-Id: I83400dab417c933d5cd956c0d168c45b9d79dab7
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/gui/text/qfont.cpp')
| -rw-r--r-- | src/gui/text/qfont.cpp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index 71c060ebdb..7b2288cbc6 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -549,9 +549,7 @@ QFontEngineData::~QFontEngineData() Returns the name of the font within the underlying window system. - On X11, this function will return an empty string if Qt is built with - FontConfig support; otherwise the XLFD (X Logical Font Description) is - returned. + On X11, this function will return an empty string. Using the return value of this function is usually \e not \e portable. @@ -562,11 +560,7 @@ QFontEngineData::~QFontEngineData() /*! \fn void QFont::setRawName(const QString &name) - Sets a font by its system specific name. The function is - particularly useful under X, where system font settings (for - example X resources) are usually available in XLFD (X Logical Font - Description) form only. You can pass an XLFD as \a name to this - function. + Sets a font by its system specific name. A font set with setRawName() is still a full-featured QFont. It can be queried (for example with italic()) or modified (for example with @@ -575,10 +569,6 @@ QFontEngineData::~QFontEngineData() If Qt's internal font database cannot resolve the raw name, the font becomes a raw font with \a name as its family. - Note that the present implementation does not handle wildcards in - XLFDs well, and that font aliases (file \c fonts.alias in the font - directory on X11) are not supported. - \sa rawName(), setRawMode(), setFamily() */ @@ -1425,10 +1415,6 @@ int QFont::stretch() const The stretch factor is only applied to outline fonts. The stretch factor is ignored for bitmap fonts. - NOTE: QFont cannot stretch XLFD fonts. When loading XLFD fonts on - X11, the stretch factor is matched against a predefined set of - values for the SETWIDTH_NAME field of the XLFD. - \sa stretch(), QFont::Stretch */ void QFont::setStretch(int factor) |