diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-12-18 01:18:33 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-12-18 01:18:33 (GMT) |
| commit | 1900bfc37d38806894db2eb1deace8aff200ed88 (patch) | |
| tree | 4dd64a5e1c3ffdb297240c28dd967beb65490cc0 /src/gui/painting/qpaintengine_raster.cpp | |
| parent | 7f0b65bf04f96edf0d39547f499dea1746d69ba3 (diff) | |
| parent | 0ad9f711969ddbf5995ddf2b7fcd5087698b93d1 (diff) | |
| download | Qt-1900bfc37d38806894db2eb1deace8aff200ed88.zip Qt-1900bfc37d38806894db2eb1deace8aff200ed88.tar.gz Qt-1900bfc37d38806894db2eb1deace8aff200ed88.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/painting/qpaintengine_raster.cpp')
| -rw-r--r-- | src/gui/painting/qpaintengine_raster.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index 4a72434..aa3b89e 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -3018,10 +3018,10 @@ void QRasterPaintEngine::drawCachedGlyphs(const QPointF &p, const QTextItemInt & QFontEngineGlyphCache::Type glyphType = ti.fontEngine->glyphFormat >= 0 ? QFontEngineGlyphCache::Type(ti.fontEngine->glyphFormat) : d->glyphCacheType; QImageTextureGlyphCache *cache = - (QImageTextureGlyphCache *) ti.fontEngine->glyphCache(glyphType, s->matrix); + (QImageTextureGlyphCache *) ti.fontEngine->glyphCache(0, glyphType, s->matrix); if (!cache) { cache = new QImageTextureGlyphCache(glyphType, s->matrix); - ti.fontEngine->setGlyphCache(glyphType, cache); + ti.fontEngine->setGlyphCache(0, cache); } cache->populate(ti, glyphs, positions); |