diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2013-12-16 08:14:35 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-17 08:58:28 +0100 |
| commit | 3bcba4ceedb636d02b6cf52f81d2e688d92309a7 (patch) | |
| tree | bb098bc9e3291b6d8271aedfef241c465379a77d /src/gui | |
| parent | 9b079df3f139618f9b47a130c31ea3cfdf42a76f (diff) | |
Fix build with -Werror
Change-Id: I2fe4b006dc0696e5491792846bdb8c99ac31af6e
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qharfbuzzng.cpp | 2 | ||||
| -rw-r--r-- | src/gui/text/qtextengine.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qharfbuzzng.cpp b/src/gui/text/qharfbuzzng.cpp index 08072b1cf3..b4ab5856df 100644 --- a/src/gui/text/qharfbuzzng.cpp +++ b/src/gui/text/qharfbuzzng.cpp @@ -581,7 +581,7 @@ static hb_user_data_key_t _useDesignMetricsKey; void hb_qt_font_set_use_design_metrics(hb_font_t *font, uint value) { - hb_font_set_user_data(font, &_useDesignMetricsKey, (void *)value, NULL, true); + hb_font_set_user_data(font, &_useDesignMetricsKey, (void *)quintptr(value), NULL, true); } uint hb_qt_font_get_use_design_metrics(hb_font_t *font) diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index 08b0491ddc..a1206ab3d5 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -1124,7 +1124,7 @@ int QTextEngine::shapeTextWithHarfbuzzNG(const QScriptItem &si, const ushort *st hb_qt_font_set_use_design_metrics(hb_font, option.useDesignMetrics() ? uint(QFontEngine::DesignMetrics) : 0); // ### const hb_feature_t features[1] = { - { HB_TAG('k','e','r','n'), !!kerningEnabled, 0, -1 } + { HB_TAG('k','e','r','n'), !!kerningEnabled, 0, uint(-1) } }; const int num_features = 1; shapedOk = hb_shape_full(hb_font, buffer, features, num_features, 0); |