diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-24 15:55:59 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-24 15:55:59 (GMT) |
| commit | 28ee9ee0bfe8196d7c981e53a691bee8bdbeecd5 (patch) | |
| tree | c698e6a8741ca61cc5bb5a89e98d713c928a55ff | |
| parent | 447808745e45855cd4586e893111687e4594fc04 (diff) | |
| parent | b77fe44616237d992d87975c3fbb556a26dcf069 (diff) | |
| download | Qt-28ee9ee0bfe8196d7c981e53a691bee8bdbeecd5.zip Qt-28ee9ee0bfe8196d7c981e53a691bee8bdbeecd5.tar.gz Qt-28ee9ee0bfe8196d7c981e53a691bee8bdbeecd5.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
Stop using XLFD as fontconfig matching fallback
| -rw-r--r-- | src/gui/text/qfontdatabase_x11.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/gui/text/qfontdatabase_x11.cpp b/src/gui/text/qfontdatabase_x11.cpp index 2186058..f923d87 100644 --- a/src/gui/text/qfontdatabase_x11.cpp +++ b/src/gui/text/qfontdatabase_x11.cpp @@ -1972,17 +1972,6 @@ void QFontDatabase::load(const QFontPrivate *d, int script) #ifndef QT_NO_FONTCONFIG } else if (X11->has_fontconfig) { fe = loadFc(d, script, req); - if (fe != 0 && fe->fontDef.pixelSize != req.pixelSize && mainThread && qt_is_gui_used) { - QFontEngine *xlfdFontEngine = loadXlfd(d->screen, script, req); - if (xlfdFontEngine->fontDef.family == fe->fontDef.family) { - delete fe; - fe = xlfdFontEngine; - } else { - delete xlfdFontEngine; - } - } - - #endif } else if (mainThread && qt_is_gui_used) { fe = loadXlfd(d->screen, script, req); |