diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-03-03 15:41:57 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-03-03 15:41:57 (GMT) |
| commit | 7b7630eaca0fe1c3e0484232aa42b7cf9e86e3a3 (patch) | |
| tree | 46cfa16fe13528ae668148d8af98fb6e156f0eb6 /src/gui/text/qtextengine_mac.cpp | |
| parent | 4ec935b3e738f79d76b708773c49471cffc46f65 (diff) | |
| parent | 5414957f0feebe24a2aa0ac7c5ec32e53e49b57a (diff) | |
| download | Qt-7b7630eaca0fe1c3e0484232aa42b7cf9e86e3a3.zip Qt-7b7630eaca0fe1c3e0484232aa42b7cf9e86e3a3.tar.gz Qt-7b7630eaca0fe1c3e0484232aa42b7cf9e86e3a3.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into lighthouse-master
Diffstat (limited to 'src/gui/text/qtextengine_mac.cpp')
| -rw-r--r-- | src/gui/text/qtextengine_mac.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/text/qtextengine_mac.cpp b/src/gui/text/qtextengine_mac.cpp index c0a1e64..97e8c5b 100644 --- a/src/gui/text/qtextengine_mac.cpp +++ b/src/gui/text/qtextengine_mac.cpp @@ -607,8 +607,9 @@ void QTextEngine::shapeTextMac(int item) const bool stringToCMapFailed = false; if (!fe->stringToCMap(str, len, &g, &num_glyphs, flags, log_clusters, attributes())) { ensureSpace(num_glyphs); - stringToCMapFailed = fe->stringToCMap(str, len, &g, &num_glyphs, flags, log_clusters, - attributes()); + g = availableGlyphs(&si); + stringToCMapFailed = !fe->stringToCMap(str, len, &g, &num_glyphs, flags, log_clusters, + attributes()); } if (!stringToCMapFailed) { |