diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2012-01-23 15:17:21 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-24 21:02:17 +0100 |
| commit | 7412dc96c6b7cc1a196c4afb06e8b51f7ee04f44 (patch) | |
| tree | c972b831699efed357ca0daaab0df5e137c17253 | |
| parent | d2d53dffbc3ba52333e559e2c0391bd73e5b840c (diff) | |
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>
| -rw-r--r-- | src/quick/scenegraph/qsgdefaultglyphnode_p.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp index 790de062c2..d99ea2bfba 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); |