diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-12-15 12:59:09 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-12-30 15:17:32 +0000 |
| commit | f3f4f95536133c7ec7ef27e5a8263f35cc3bc4b6 (patch) | |
| tree | f72c8ffbee95fcd0ab9883a31ea2c150d432d93b | |
| parent | 809200a83e366141d543336503635cf57c626434 (diff) | |
Bump the minimum required version for harfbuzz to 1.6.0
This is the first version that supports Unicode 10.0.0, which
we now require for Qt.
Change-Id: Iff3cb757eb7d97dace5649262c337a4ed1145199
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rw-r--r-- | src/gui/configure.json | 2 | ||||
| -rw-r--r-- | src/gui/text/qharfbuzzng.cpp | 24 |
2 files changed, 1 insertions, 25 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index be146e8e33..b617a1e31d 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -207,7 +207,7 @@ "test": { "include": "harfbuzz/hb.h", "tail": [ - "#if !HB_VERSION_ATLEAST(0, 9, 42)", + "#if !HB_VERSION_ATLEAST(1, 6, 0)", "# error This version of harfbuzz is too old.", "#endif" ], diff --git a/src/gui/text/qharfbuzzng.cpp b/src/gui/text/qharfbuzzng.cpp index 6aca660205..3e27ee4fbf 100644 --- a/src/gui/text/qharfbuzzng.cpp +++ b/src/gui/text/qharfbuzzng.cpp @@ -422,7 +422,6 @@ hb_unicode_funcs_t *hb_qt_get_unicode_funcs() // Font routines -#if HB_VERSION_ATLEAST(1, 1, 3) static hb_bool_t _hb_qt_get_font_h_extents(hb_font_t * /*font*/, void *font_data, hb_font_extents_t *metrics, @@ -437,9 +436,7 @@ _hb_qt_get_font_h_extents(hb_font_t * /*font*/, void *font_data, return true; } -#endif -#if HB_VERSION_ATLEAST(1, 2, 3) static hb_bool_t _hb_qt_font_get_nominal_glyph(hb_font_t * /*font*/, void *font_data, hb_codepoint_t unicode, @@ -453,7 +450,6 @@ _hb_qt_font_get_nominal_glyph(hb_font_t * /*font*/, void *font_data, return *glyph != 0; } -#endif static hb_bool_t _hb_qt_font_get_variation_glyph(hb_font_t * /*font*/, void *font_data, @@ -490,17 +486,6 @@ _hb_qt_font_get_glyph_h_advance(hb_font_t *font, void *font_data, return advance.value(); } -#if !HB_VERSION_ATLEAST(1, 1, 2) -static hb_bool_t -_hb_qt_font_get_glyph_h_origin(hb_font_t * /*font*/, void * /*font_data*/, - hb_codepoint_t /*glyph*/, - hb_position_t * /*x*/, hb_position_t * /*y*/, - void * /*user_data*/) -{ - return true; // we always work in the horizontal coordinates -} -#endif - static hb_position_t _hb_qt_font_get_glyph_h_kerning(hb_font_t *font, void *font_data, hb_codepoint_t first_glyph, hb_codepoint_t second_glyph, @@ -581,19 +566,10 @@ struct _hb_qt_font_funcs_t { { funcs = hb_font_funcs_create(); -#if HB_VERSION_ATLEAST(1, 1, 3) hb_font_funcs_set_font_h_extents_func(funcs, _hb_qt_get_font_h_extents, NULL, NULL); -#endif -#if HB_VERSION_ATLEAST(1, 2, 3) hb_font_funcs_set_nominal_glyph_func(funcs, _hb_qt_font_get_nominal_glyph, NULL, NULL); hb_font_funcs_set_variation_glyph_func(funcs, _hb_qt_font_get_variation_glyph, NULL, NULL); -#else - hb_font_funcs_set_glyph_func(funcs, _hb_qt_font_get_variation_glyph, NULL, NULL); -#endif hb_font_funcs_set_glyph_h_advance_func(funcs, _hb_qt_font_get_glyph_h_advance, NULL, NULL); -#if !HB_VERSION_ATLEAST(1, 1, 2) - hb_font_funcs_set_glyph_h_origin_func(funcs, _hb_qt_font_get_glyph_h_origin, NULL, NULL); -#endif hb_font_funcs_set_glyph_h_kerning_func(funcs, _hb_qt_font_get_glyph_h_kerning, NULL, NULL); hb_font_funcs_set_glyph_extents_func(funcs, _hb_qt_font_get_glyph_extents, NULL, NULL); hb_font_funcs_set_glyph_contour_point_func(funcs, _hb_qt_font_get_glyph_contour_point, NULL, NULL); |