From: Jiang Jiang <jiang.jiang@nokia.com>
Date: Mon, 23 Jan 2012 14:17:21 +0000 (+0100)
Subject: Update for glyphMargin() migration in qtbase
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=7412dc96c6b7cc1a196c4afb06e8b51f7ee04f44;p=konrad%2Fqtdeclarative.git

Update for glyphMargin() migration in qtbase

glyphMargin() has been moved from QTextureGlyphCache to QFontEngine
in qtbase. Update private API usage for that.

Change-Id: Ia74c1387eaad4cb961ca0fe36905254edb351258
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
---

diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
index 790de06..d99ea2b 100644
--- a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
@@ -195,7 +195,7 @@ void QSGTextMaskMaterial::populate(const QPointF &p,
                     fixedPointPositions.data());
     cache->fillInPendingGlyphs();
 
-    int margin = cache->glyphMargin();
+    int margin = fontD->fontEngine->glyphMargin(cache->cacheType());
 
     Q_ASSERT(geometry->indexType() == GL_UNSIGNED_SHORT);
     geometry->allocate(glyphIndexes.size() * 4, glyphIndexes.size() * 6);