diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-20 13:35:27 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-25 12:53:46 +0200 |
| commit | 8afc0676471b4802884ca7ee78d0097f1e5b5646 (patch) | |
| tree | 0e62d61de96e80883ba06ccec7cda9f8edca5e1c /src/gui/text/qfontsubset.cpp | |
| parent | b22d290a37903f2c5ecfe58e8183cd293ead99dc (diff) | |
QtGui: Remove Q_WS and qpa.
Enable compilation without -qpa.
Remove QT_NO_FREETYPE and QT_NO_FONTCONFIG when building.
Change-Id: I0e017cc47ee06b885be65deaeb67a449a119b8be
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/gui/text/qfontsubset.cpp')
| -rw-r--r-- | src/gui/text/qfontsubset.cpp | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/src/gui/text/qfontsubset.cpp b/src/gui/text/qfontsubset.cpp index cf707fe78f..de945e129b 100644 --- a/src/gui/text/qfontsubset.cpp +++ b/src/gui/text/qfontsubset.cpp @@ -45,12 +45,6 @@ #include "private/qpdf_p.h" #include "private/qfunctions_p.h" - -#ifndef QT_NO_FREETYPE -#include <ft2build.h> -#include FT_FREETYPE_H -#endif - QT_BEGIN_NAMESPACE static const char * const agl = @@ -276,13 +270,6 @@ QByteArray QFontSubset::glyphName(unsigned short unicode, bool symbol) return buffer; } -#ifndef QT_NO_FREETYPE -static FT_Face ft_face(const QFontEngine *engine) -{ - return 0; -} -#endif - QByteArray QFontSubset::glyphName(unsigned int glyph, const QVector<int> reverseMap) const { uint glyphIndex = glyph_indices[glyph]; @@ -292,20 +279,6 @@ QByteArray QFontSubset::glyphName(unsigned int glyph, const QVector<int> reverse QByteArray ba; QPdf::ByteStream s(&ba); -#ifndef QT_NO_FREETYPE - FT_Face face = ft_face(fontEngine); - - char name[32]; - name[0] = 0; - if (face && FT_HAS_GLYPH_NAMES(face)) { - FT_Get_Glyph_Name(face, glyphIndex, &name, 32); - if (name[0] == '.') // fix broken PS fonts returning .notdef for many glyphs - name[0] = 0; - } - if (name[0]) { - s << '/' << name; - } else -#endif if (reverseMap[glyphIndex] && reverseMap[glyphIndex] < 0x10000) { s << '/' << glyphName(reverseMap[glyphIndex], false); } else { |