diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-29 23:58:27 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-29 23:58:27 +0100 |
| commit | 1fe08312164a8eef87b3efe9b77452b86224999f (patch) | |
| tree | 65d3147ae69860d9031ffaa86dcdd28f5d5fca21 /src/3rdparty | |
| parent | 10b5653ad4f25c6f37d640facf4a5ef01fe25926 (diff) | |
| parent | c2c31f30830a4e1e455a13321dd7bae6ac8b360f (diff) | |
| download | qt4-tools-1fe08312164a8eef87b3efe9b77452b86224999f.tar.gz | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 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 f3ec8e10f5..bfb03ab432 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; |