diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-02-15 08:24:36 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-02-15 08:24:36 (GMT) |
| commit | 22157cb26419ddcaa927cbfa88ad04486b1d1ee0 (patch) | |
| tree | f84ff6878248c791319fc6be1f1956f2177b5bdb /src/gui/text/qfont.cpp | |
| parent | fa6dc19b9212706532f3f88da0fb3542e9c3eafe (diff) | |
| parent | a14b8805945c5e00be26092406a468fd8b8acc14 (diff) | |
| download | Qt-22157cb26419ddcaa927cbfa88ad04486b1d1ee0.zip Qt-22157cb26419ddcaa927cbfa88ad04486b1d1ee0.tar.gz Qt-22157cb26419ddcaa927cbfa88ad04486b1d1ee0.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
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 bbd35f1..dd9e69e 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -629,8 +629,9 @@ QFontEngineData::~QFontEngineData() Returns the name of the font within the underlying window system. - Only on X11 when Qt was built without FontConfig support the XLFD (X Logical Font Description) - is returned; otherwise an empty string. + 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. Using the return value of this function is usually \e not \e portable. |