From: Jiang Jiang <jiang.jiang@nokia.com>
Date: Tue, 8 Nov 2011 09:17:29 +0000 (+0100)
Subject: Fix default glyph node after qtbase refactor
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=ad320d873d27686ca0610ffd692f12131cc864ad;p=konrad%2Fqtdeclarative.git

Fix default glyph node after qtbase refactor

Change-Id: Ib08c1bcf33bafcee828169b3ddfa264bd010cfef
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---

diff --git a/src/declarative/scenegraph/qsgdefaultglyphnode_p.cpp b/src/declarative/scenegraph/qsgdefaultglyphnode_p.cpp
index 649c543..3476ab1 100644
--- a/src/declarative/scenegraph/qsgdefaultglyphnode_p.cpp
+++ b/src/declarative/scenegraph/qsgdefaultglyphnode_p.cpp
@@ -208,7 +208,7 @@ void QSGTextMaskMaterial::populate(const QPointF &p,
     for (int i=0; i<glyphIndexes.size(); ++i) {
          QFixed subPixelPosition;
          if (supportsSubPixelPositions)
-             subPixelPosition = cache->subPixelPositionForX(QFixed::fromReal(glyphPositions.at(i).x()));
+             subPixelPosition = fontD->fontEngine->subPixelPositionForX(QFixed::fromReal(glyphPositions.at(i).x()));
 
          QTextureGlyphCache::GlyphAndSubPixelPosition glyph(glyphIndexes.at(i), subPixelPosition);
          const QTextureGlyphCache::Coord &c = cache->coords.value(glyph);