diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-03 15:05:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-03 15:05:20 (GMT) |
| commit | 92f06c223ba2457e74944a786bed629bdf00ca4b (patch) | |
| tree | 4425b55e5d7ee6255e6c17489c6c9bc3dd425613 /src/gui | |
| parent | 06c23ac8a6d03af3b9674c8c7850560a0973b2fb (diff) | |
| parent | 83bf60ee19bb7c0815549aec5dcc8f4190301cc5 (diff) | |
| download | Qt-92f06c223ba2457e74944a786bed629bdf00ca4b.zip Qt-92f06c223ba2457e74944a786bed629bdf00ca4b.tar.gz Qt-92f06c223ba2457e74944a786bed629bdf00ca4b.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integrationv4.8.0-rc1
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Fix possible crash in QFontEngineFT
Diffstat (limited to 'src/gui')
| -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; |