qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build with -Werror 

Change-Id: I2fe4b006dc0696e5491792846bdb8c99ac31af6e
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Konstantin Ritt 2013-12-16 08:14:35 +02:00 committed by The Qt Project
parent 9b079df3f1
commit 3bcba4ceed
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/text/qharfbuzzng.cpp
View File

@ -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)

2
src/gui/text/qtextengine.cpp
View File

@ -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);