diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-27 15:57:23 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-27 15:58:43 (GMT) |
| commit | f93097671f512f38790ba2d56bd5b1e037810266 (patch) | |
| tree | a4dd9aa09a8ca658bb9a46da26472ee0c5f317da /src/3rdparty | |
| parent | 19d0a365dd99dc1a108e58949f7d0f49bac72623 (diff) | |
| parent | 583b1529894aca5e9ffa353f0547dfb4b8b0ab21 (diff) | |
| download | Qt-f93097671f512f38790ba2d56bd5b1e037810266.zip Qt-f93097671f512f38790ba2d56bd5b1e037810266.tar.gz Qt-f93097671f512f38790ba2d56bd5b1e037810266.tar.bz2 | |
Merge commit oslo-staging-2/4.6 into upstream/4.6
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp index f3ec8e1..bfb03ab 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp +++ b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp @@ -975,7 +975,7 @@ HB_Face HB_NewFace(void *font, HB_GetFontTableFunc tableFunc) face->glyphs_substituted = false; face->buffer = 0; - HB_Error error; + HB_Error error = HB_Err_Ok; HB_Stream stream; HB_Stream gdefStream; |