From d3f7a9d6f1b8f6e24fb49aaa8caeaa7623ae48b5 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 23 Jul 2011 17:13:36 -0500 Subject: Apply all Qt3.3.8d patches NOTE: This will *likely* break compilation of TQt4 Please wait a few days for fixes to be committed as needed! --- tqtinterface/qt4/src/kernel/tqfontdatabase_x11.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'tqtinterface/qt4/src/kernel/tqfontdatabase_x11.cpp') diff --git a/tqtinterface/qt4/src/kernel/tqfontdatabase_x11.cpp b/tqtinterface/qt4/src/kernel/tqfontdatabase_x11.cpp index 8ea403f..97cb544 100644 --- a/tqtinterface/qt4/src/kernel/tqfontdatabase_x11.cpp +++ b/tqtinterface/qt4/src/kernel/tqfontdatabase_x11.cpp @@ -721,6 +721,9 @@ static void loadXlfds( const char *reqFamily, int encoding_id ) if ( fontFamily && fontFamily->xlfdLoaded ) return; +#ifdef TQT_XFT2 + if ( !qt_has_xft ) { +#endif // TQT_XFT2 int fontCount; // force the X server to give us XLFDs TQCString xlfd_pattern = "-*-"; @@ -822,8 +825,11 @@ static void loadXlfds( const char *reqFamily, int encoding_id ) } XFreeFontNames( fontList ); -} +#ifdef TQT_XFT2 + } +#endif // TQT_XFT2 +} #ifndef TQT_NO_XFTFREETYPE static int getXftWeight(int xftweight) -- cgit v1.2.1