diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2011-02-28 11:54:57 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2011-02-28 11:54:57 (GMT) |
| commit | 987ab4d6caf05a81304deb1e46f91ff34c648a3c (patch) | |
| tree | 97074a9613d4ec057cc3db663227858b14e97182 /src/gui | |
| parent | e77e820191919aaf54c85f599cf71cfbecd1ee14 (diff) | |
| parent | 388c57c0a1f53cd4a98aa12841eac603332dfe54 (diff) | |
| download | Qt-987ab4d6caf05a81304deb1e46f91ff34c648a3c.zip Qt-987ab4d6caf05a81304deb1e46f91ff34c648a3c.tar.gz Qt-987ab4d6caf05a81304deb1e46f91ff34c648a3c.tar.bz2 | |
Merge branch 'graphics-team-text-4.7' into 4.7
Diffstat (limited to 'src/gui')
| -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 ce42241..c34bdb3 100644 --- a/src/gui/text/qtextengine_mac.cpp +++ b/src/gui/text/qtextengine_mac.cpp @@ -604,8 +604,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) { |