change order of #includes so that USE_LYX_FONTCACHE has a meaningful value

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10096 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2005-06-21 13:10:59 +00:00
parent ddedf9f5ef
commit 97d84f7589
2 changed files with 11 additions and 6 deletions

View File

@ -1,3 +1,8 @@
2005-06-21 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* qfont_loader.h (USE_LYX_FONTCACHE): change order of #includes so
that the test is meaningful.
2005-06-16 Angus Leeming <leeming@lyx.org>
* QPrefs.C (apply, update_contents): wrap all input and output of

View File

@ -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
@ -20,12 +26,6 @@
#include <map>
#endif
#include "encoding.h"
#include "lyxfont.h"
#include <qfont.h>
#include <qfontmetrics.h>
/**
* Qt font loader for LyX. Matches LyXFonts against
* actual QFont instances, and also caches metrics.