My patch for not caching characters widths with recent Qt versions was actually completely broken. A re-ordering of headers fixes that.
Committing now. JMarc
Index: src/frontends/qt2/ChangeLog =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/ChangeLog,v retrieving revision 1.794 diff -u -p -r1.794 ChangeLog --- src/frontends/qt2/ChangeLog 18 Jun 2005 00:18:29 -0000 1.794 +++ src/frontends/qt2/ChangeLog 21 Jun 2005 13:07:35 -0000 @@ -1,3 +1,8 @@ +2005-06-21 Jean-Marc Lasgouttes <[EMAIL PROTECTED]> + + * qfont_loader.h (USE_LYX_FONTCACHE): change order of #includes so + that the test is meaningful. + 2005-06-16 Angus Leeming <[EMAIL PROTECTED]> * QPrefs.C (apply, update_contents): wrap all input and output of Index: src/frontends/qt2/qfont_loader.h =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/qfont_loader.h,v retrieving revision 1.16 diff -u -p -r1.16 qfont_loader.h --- src/frontends/qt2/qfont_loader.h 10 Jun 2005 14:53:42 -0000 1.16 +++ src/frontends/qt2/qfont_loader.h 21 Jun 2005 13:07:35 -0000 @@ -12,6 +12,12 @@ #ifndef QFONTLOADER_H #define QFONTLOADER_H +#include "encoding.h" +#include "lyxfont.h" + +#include <qfont.h> +#include <qfontmetrics.h> + #if QT_VERSION < 0x030100 #define USE_LYX_FONTCACHE #endif @@ -19,12 +25,6 @@ #if defined(USE_LYX_FONTCACHE) #include <map> #endif - -#include "encoding.h" -#include "lyxfont.h" - -#include <qfont.h> -#include <qfontmetrics.h> /** * Qt font loader for LyX. Matches LyXFonts against
