summaryrefslogtreecommitdiffstats
path: root/src/platformsupport/fontdatabases/basic
diff options
context:
space:
mode:
authorHarald Fernengel <harald.fernengel@nokia.com>2012-03-13 21:02:41 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-14 11:37:18 +0100
commit7220d7f365d6cfa500db8517493c453603575c8b (patch)
tree7247b81e6fe3f98fcb00a8635ea514d8d788d5a7 /src/platformsupport/fontdatabases/basic
parent8c3e5700a14ff52c2dfff5ab1b1fb47d7240aa02 (diff)
Fix LSB build
Fix compliation in LSB by removing legacy calls and adding an explicit header. Change-Id: I13a73211c07457195b5d5aad0854643da1e25f9b Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Diffstat (limited to 'src/platformsupport/fontdatabases/basic')
-rw-r--r--src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp5
1 files changed, 3 insertions, 2 deletions
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 <ft2build.h>
#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;
}