summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSamuel Rødal <sroedal@trolltech.com>2009-05-22 12:14:31 (GMT)
committerSamuel Rødal <sroedal@trolltech.com>2009-05-22 12:29:16 (GMT)
commit759b7ee720fa365f93fe02ecb5b842adce81d02d (patch)
tree2ae4bb0bc1416c083e9e90d953ed50fab4f0a4e1 /src
parentb89efc8e7f3289ff85a5076297e4357283dd24a5 (diff)
downloadQt-759b7ee720fa365f93fe02ecb5b842adce81d02d.zip
Qt-759b7ee720fa365f93fe02ecb5b842adce81d02d.tar.gz
Qt-759b7ee720fa365f93fe02ecb5b842adce81d02d.tar.bz2
Fixed potential bug caused by change b89efc8e7f32.
If ensureSpace causes the layoutData to reallocate then the initialGlyphs pointers will no longer be valid. Reviewed-by: Simon Hausmann
Diffstat (limited to 'src')
-rw-r--r--src/gui/text/qtextengine.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index da1ab25..d41d414 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -1219,7 +1219,7 @@ void QTextEngine::shapeTextWithHarfbuzz(int item) const
QFontEngine *actualFontEngine = font;
uint engineIdx = 0;
if (font->type() == QFontEngine::Multi) {
- engineIdx = uint(initialGlyphs.glyphs[glyph_pos] >> 24);
+ engineIdx = uint(availableGlyphs(&si).glyphs[glyph_pos] >> 24);
actualFontEngine = static_cast<QFontEngineMulti *>(font)->engine(engineIdx);
}