diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-28 16:28:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-28 16:28:08 (GMT) |
| commit | 4074b7ff641bfc252b691d9c8bf8ae97edda4d81 (patch) | |
| tree | 1a30bd66eafcdcf2fc819057efff228dde0d1fb2 /src | |
| parent | c5cd6161a8b9e03eea58314806a67f7390ed0d6a (diff) | |
| parent | c9c54682bcd23598ac7a8db3b10e9f18c978e268 (diff) | |
| download | Qt-4074b7ff641bfc252b691d9c8bf8ae97edda4d81.zip Qt-4074b7ff641bfc252b691d9c8bf8ae97edda4d81.tar.gz Qt-4074b7ff641bfc252b691d9c8bf8ae97edda4d81.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix crash in raster on X11 when text contains unsupported characters
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/painting/qtextureglyphcache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp index 2420f31..3918ffc 100644 --- a/src/gui/painting/qtextureglyphcache.cpp +++ b/src/gui/painting/qtextureglyphcache.cpp @@ -178,7 +178,7 @@ bool QTextureGlyphCache::populate(QFontEngine *fontEngine, int numGlyphs, const QImage QTextureGlyphCache::textureMapForGlyph(glyph_t g) const { #if defined(Q_WS_X11) - if (m_transform.type() > QTransform::TxTranslate) { + if (m_transform.type() > QTransform::TxTranslate && m_current_fontengine->type() == QFontEngine::Freetype) { QFontEngineFT::GlyphFormat format = QFontEngineFT::Format_None; QImage::Format imageFormat = QImage::Format_Invalid; switch (m_type) { |