]>
Commit | Line | Data |
---|---|---|
9871d57a | 1 | --- qt-copy/src/gui/text/qfontdatabase_x11.cpp.niedakh 2005-05-13 16:35:52.000000000 +0200 |
2 | +++ qt-copy/src/gui/text/qfontdatabase_x11.cpp 2005-05-13 23:30:47.000000000 +0200 | |
5f90feaa | 3 | @@ -27,7 +27,7 @@ |
d7920625 | 4 | ****************************************************************************/ |
5 | ||
6 | #include <qplatformdefs.h> | |
7 | - | |
8 | +#include <qsettings.h> | |
9 | #include <qdatetime.h> | |
d7920625 | 10 | #include <qpaintdevice.h> |
5f90feaa | 11 | |
72fb07e3 | 12 | @@ -1248,8 +1248,11 @@ |
13 | if (!stretch) | |
14 | stretch = 100; | |
15 | FcPatternAddInteger(pattern, FC_WIDTH, stretch); | |
5f90feaa | 16 | + |
17 | + QSettings prefs; | |
18 | + bool qt_use_antialiasing = prefs.value( "/qt/useXft", TRUE ).toBool() ; | |
5f90feaa | 19 | |
9871d57a | 20 | - if (QX11Info::appDepth(fp->screen) <= 8) { |
21 | + if (QX11Info::appDepth(fp->screen) <= 8 || ! (qt_use_antialiasing)) { | |
5f90feaa | 22 | // can't do antialiasing on 8bpp |
23 | FcPatternAddBool(pattern, FC_ANTIALIAS, false); | |
9871d57a | 24 | } else if (request.styleStrategy & (QFont::PreferAntialias|QFont::NoAntialias)) { |