From 7220d7f365d6cfa500db8517493c453603575c8b Mon Sep 17 00:00:00 2001 From: Harald Fernengel Date: Tue, 13 Mar 2012 21:02:41 +0100 Subject: Fix LSB build Fix compliation in LSB by removing legacy calls and adding an explicit header. Change-Id: I13a73211c07457195b5d5aad0854643da1e25f9b Reviewed-by: Jiang Jiang --- src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/platformsupport') diff --git a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp index ebe73bff16..38a6f2f9df 100644 --- a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp +++ b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp @@ -55,6 +55,7 @@ #include #include FT_TRUETYPE_TABLES_H +#include FT_ERRORS_H QT_BEGIN_NAMESPACE @@ -362,8 +363,8 @@ QStringList QBasicFontDatabase::addTTFile(const QByteArray &fontData, const QByt // detect symbol fonts for (int i = 0; i < face->num_charmaps; ++i) { FT_CharMap cm = face->charmaps[i]; - if (cm->encoding == ft_encoding_adobe_custom - || cm->encoding == ft_encoding_symbol) { + if (cm->encoding == FT_ENCODING_ADOBE_CUSTOM + || cm->encoding == FT_ENCODING_MS_SYMBOL) { writingSystems.setSupported(QFontDatabase::Symbol); break; } -- cgit v1.2.3