Fix LSB build
authorHarald Fernengel <harald.fernengel@nokia.com>
Tue, 13 Mar 2012 20:02:41 +0000 (21:02 +0100)
committerQt by Nokia <qt-info@nokia.com>
Wed, 14 Mar 2012 10:37:18 +0000 (11:37 +0100)
Fix compliation in LSB by removing legacy calls and adding an explicit
header.

Change-Id: I13a73211c07457195b5d5aad0854643da1e25f9b
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp

index ebe73bf..38a6f2f 100644 (file)
@@ -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;
             }