diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-17 02:03:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-17 02:03:53 (GMT) |
| commit | dc5543f5595870209e8122d13d070694b5e0eb39 (patch) | |
| tree | 09fe74aa408e9d2fc9198df71dc032e0680fe4b7 /src/gui/text | |
| parent | 30c8d1e3dccc83499ac3d76284cfb2e8d860808a (diff) | |
| parent | 0842309e6e04d34c027374d0793dc60d3ec6e28b (diff) | |
| download | Qt-dc5543f5595870209e8122d13d070694b5e0eb39.zip Qt-dc5543f5595870209e8122d13d070694b5e0eb39.tar.gz Qt-dc5543f5595870209e8122d13d070694b5e0eb39.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 on Mac OS X when drawing text with Qt::TextBypassShaping set
Fixed infinite recursion when drawing very large painter paths.
Fixed full-rule on clipped painter paths.
Removed unnecessary lines of code.
Fixed problem with wrong size hints when items were removed.
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfontengine_mac.mm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_mac.mm b/src/gui/text/qfontengine_mac.mm index 3be6d28..7ceed61 100644 --- a/src/gui/text/qfontengine_mac.mm +++ b/src/gui/text/qfontengine_mac.mm @@ -237,7 +237,8 @@ bool QCoreTextFontEngineMulti::stringToCMap(const QChar *str, int len, QGlyphLay *nglyphs = len; for (int i = 0; i < len; ++i) { outGlyphs[i] = 0; - logClusters[i] = i; + if (logClusters) + logClusters[i] = i; outAdvances_x[i] = QFixed(); outAdvances_y[i] = QFixed(); outAttributes[i].clusterStart = true; |