1 files changed, 5 insertions, 3 deletions
diff --git a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp
index 16745c18d5..b705ef48af 100644
--- a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp
+++ b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp
@@ -146,7 +146,10 @@ void QSGDefaultDistanceFieldGlyphCache::requestGlyphs(const QSet<glyph_t> &glyph
 
 void QSGDefaultDistanceFieldGlyphCache::storeGlyphs(const QList<QDistanceField> &glyphs)
 {
-    QHash<TextureInfo *, QVector<glyph_t> > glyphTextures;
+    typedef QHash<TextureInfo *, QVector<glyph_t> > GlyphTextureHash;
+    typedef GlyphTextureHash::const_iterator GlyphTextureHashConstIt;
+
+    GlyphTextureHash glyphTextures;
 
     GLint alignment = 4; // default value
     m_funcs->glGetIntegerv(GL_UNPACK_ALIGNMENT, &alignment);
@@ -203,8 +206,7 @@ void QSGDefaultDistanceFieldGlyphCache::storeGlyphs(const QList<QDistanceField>
     // restore to previous alignment
     m_funcs->glPixelStorei(GL_UNPACK_ALIGNMENT, alignment);
 
-    QHash<TextureInfo *, QVector<glyph_t> >::const_iterator i;
-    for (i = glyphTextures.constBegin(); i != glyphTextures.constEnd(); ++i) {
+    for (GlyphTextureHashConstIt i = glyphTextures.constBegin(), cend = glyphTextures.constEnd(); i != cend; ++i) {
         Texture t;
         t.textureId = i.key()->texture;
         t.size = i.key()->size;