diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-08 07:22:48 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-08 07:22:48 +1000 |
| commit | f33b28d27a8e738fa93a45f44445d0fe255810b0 (patch) | |
| tree | 0317e616ebf55b0103509074046bed5878e7ee23 /src/3rdparty/harfbuzz/src/harfbuzz-shaper-private.h | |
| parent | 2608d28edb8eeed925be89a6adc563287d12fbb2 (diff) | |
| parent | 3a4f6f7884c9ea704890cd392bb5a211d2eb5701 (diff) | |
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integrationv4.8.0
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Reduce unnecessary QtCore DLL loads during Symbian app thread creation
Fix HarfBuzz Thai character SARA AM handling
Diffstat (limited to 'src/3rdparty/harfbuzz/src/harfbuzz-shaper-private.h')
| -rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-shaper-private.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-shaper-private.h b/src/3rdparty/harfbuzz/src/harfbuzz-shaper-private.h index e1360c774a..05214e7368 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-shaper-private.h +++ b/src/3rdparty/harfbuzz/src/harfbuzz-shaper-private.h @@ -111,6 +111,7 @@ extern HB_Bool HB_HangulShape(HB_ShaperItem *shaper_item); extern HB_Bool HB_MyanmarShape(HB_ShaperItem *shaper_item); extern HB_Bool HB_KhmerShape(HB_ShaperItem *shaper_item); extern HB_Bool HB_IndicShape(HB_ShaperItem *shaper_item); +extern HB_Bool HB_ThaiShape(HB_ShaperItem *shaper_item); extern void HB_TibetanAttributes(HB_Script script, const HB_UChar16 *string, hb_uint32 from, hb_uint32 len, HB_CharAttributes *attributes); |