diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-26 10:59:22 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-26 10:59:22 (GMT) |
| commit | d749e70412691134bb4b62d58103c0bc5e9ce90d (patch) | |
| tree | c92534c87a35506802e63664427486df3b1b6962 | |
| parent | ad7ddea09126efeb58ab626dc13113e3e1956912 (diff) | |
| parent | e05734987594f0e54f58a2ab3037cdf4956e9036 (diff) | |
| download | Qt-d749e70412691134bb4b62d58103c0bc5e9ce90d.zip Qt-d749e70412691134bb4b62d58103c0bc5e9ce90d.tar.gz Qt-d749e70412691134bb4b62d58103c0bc5e9ce90d.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
Fix possible crash in QFontEngineFT
| -rw-r--r-- | src/gui/text/qfontengine_ft.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp index e20aa25..d00a048 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -801,7 +801,7 @@ int QFontEngineFT::loadFlags(QGlyphSet *set, GlyphFormat format, int flags, if (set && set->outline_drawing) load_flags = FT_LOAD_NO_BITMAP; - if (default_hint_style == HintNone || (flags & HB_ShaperFlag_UseDesignMetrics) || set->outline_drawing) + if (default_hint_style == HintNone || (flags & HB_ShaperFlag_UseDesignMetrics) || (set && set->outline_drawing)) load_flags |= FT_LOAD_NO_HINTING; else load_flags |= load_target; |