--- qt-x11-free-3.3.4/src/kernel/qfontdatabase_x11.cpp-- 2005-01-27 08:21:16.740745624 +0100 +++ qt-x11-free-3.3.4/src/kernel/qfontdatabase_x11.cpp 2005-01-27 08:23:44.875946937 +0100 @@ -712,7 +712,15 @@ static unsigned char encodingLoaded[numE static void loadXlfds( const char *reqFamily, int encoding_id ) { QtFontFamily *fontFamily = reqFamily ? db->family( reqFamily ) : 0; + // make sure we don't load XLFDs if XFT2 is used +#ifdef QT_XFT2 + if (qt_has_xft) + return; +#endif + + //QtFontFamily *fontFamily = reqFamily ? db->family( reqFamily ) : 0; + // make sure we don't load twice if ( (encoding_id == -1 && xlfdsFullyLoaded) || (encoding_id != -1 && encodingLoaded[encoding_id]) ) return; @@ -975,7 +983,7 @@ static void loadXft() }; const XftDefaultFont defaults[] = { { "Serif", "serif", FALSE }, - { "Sans Serif", "sans-serif", FALSE }, + { "Sans", "sans-serif", FALSE }, { "Monospace", "monospace", TRUE }, { 0, 0, FALSE } }; @@ -1003,6 +1011,9 @@ static void loadXft() style->smoothScalable = TRUE; QtFontSize *size = style->pixelSize( SMOOTH_SCALABLE, TRUE ); QtFontEncoding *enc = size->encodingID( -1, 0, 0, 0, 0, TRUE ); + if (f->qtname == "Monospace") + family->fixedPitch = TRUE; + enc->pitch = (f->fixed ? 'm' : 'p'); } ++f;