diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2012-08-26 00:24:54 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-29 07:56:50 +0200 |
| commit | 9f561f8a41660453b686d34e4c1d41e955bdadfa (patch) | |
| tree | c8cba1f0e79c4254b78c14a57cb0736a5f299553 /src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp | |
| parent | f61d02deeae522c410433a3aa9929e246f413cda (diff) | |
Harfbuzz: fix build with NO_OPENTYPE macro defined
Remove `DEFINES += QT_NO_OPENTYPE` since there are no QT_NO_OPENTYPE guards
and I'm not sure defining NO_OPENTYPE won't break some things.
Change-Id: I7b36d3f200408aee99db73c56baa9b4a21cb54f9
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp')
| -rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp index 1024c8162f..093e8aed94 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp +++ b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp @@ -771,6 +771,7 @@ void HB_FreeFace(HB_Face face) free(face); } +#ifndef NO_OPENTYPE HB_Bool HB_SelectScript(HB_ShaperItem *shaper_item, const HB_OpenTypeFeature *features) { HB_Script script = shaper_item->item.script; @@ -1085,6 +1086,7 @@ HB_Bool HB_OpenTypePosition(HB_ShaperItem *item, int availableGlyphs, HB_Bool do #endif return true; } +#endif // NO_OPENTYPE HB_Bool HB_ShapeItem(HB_ShaperItem *shaper_item) { |