diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-28 09:13:31 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-28 09:13:31 (GMT) |
commit | eedc18d1fdcf7c359916304cbf0b4629bbf70c84 (patch) | |
tree | 740a4f145cf97132d89dccf473507144262d3ba0 /src/gui/text | |
parent | f8ca41ab91748a4b847892af642c1a5a1cdeb105 (diff) | |
parent | 61630603636e544ff81258090dbdcd175c5c51e8 (diff) | |
download | Qt-eedc18d1fdcf7c359916304cbf0b4629bbf70c84.zip Qt-eedc18d1fdcf7c359916304cbf0b4629bbf70c84.tar.gz Qt-eedc18d1fdcf7c359916304cbf0b4629bbf70c84.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Prevent stroking zero length lines in qstroker.cpp
Make the animation driver private API
Stop using XLFD as fontconfig matching fallback
OpenGL Framebuffer Format
Diffstat (limited to 'src/gui/text')
-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); |