aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2011-05-10 12:18:55 +0200
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2011-05-10 12:19:47 +0200
commit762cbc75b94486ca93b964b4097c88ae24c667d3 (patch)
tree7b3953d1cee3c81866fa1e240fbea759c3bda019 /src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp
parentb909a2433e8bc4815d2f382ac23bb92ba1176b97 (diff)
Update to work with QGlyphs -> QGlyphRun renaming
Just some search replace to make the repository compile after QGlyphs and related APIs were renamed.
Diffstat (limited to 'src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp')
-rw-r--r--src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp b/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp
index ed2dba1ea3..d826f7f1e7 100644
--- a/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp
+++ b/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp
@@ -87,9 +87,9 @@ void QSGDistanceFieldGlyphNode::setPreferredAntialiasingMode(AntialiasingMode mo
updateMaterial();
}
-void QSGDistanceFieldGlyphNode::setGlyphs(const QPointF &position, const QGlyphs &glyphs)
+void QSGDistanceFieldGlyphNode::setGlyphs(const QPointF &position, const QGlyphRun &glyphs)
{
- QRawFont font = glyphs.font();
+ QRawFont font = glyphs.rawFont();
m_position = QPointF(position.x(), position.y() - font.ascent());
m_glyphs = glyphs;
@@ -187,7 +187,7 @@ void QSGDistanceFieldGlyphNode::updateGeometry()
void QSGDistanceFieldGlyphNode::updateFont()
{
- m_glyph_cache = QSGDistanceFieldGlyphCache::get(QGLContext::currentContext(), m_glyphs.font());
+ m_glyph_cache = QSGDistanceFieldGlyphCache::get(QGLContext::currentContext(), m_glyphs.rawFont());
}
void QSGDistanceFieldGlyphNode::updateMaterial()