Use a proper hash key for distance-field cache.

1 files changed, 2 insertions, 3 deletions

diff --git a/src/declarative/scenegraph/qsgdistancefieldglyphcache_p.h b/src/declarative/scenegraph/qsgdistancefieldglyphcache_p.h
index 60e5b5921a..5ee439552a 100644
--- a/src/declarative/scenegraph/qsgdistancefieldglyphcache_p.h
+++ b/src/declarative/scenegraph/qsgdistancefieldglyphcache_p.h
@@ -112,12 +112,11 @@ private:
     void createTexture(int width, int height);
     void resizeTexture(int width, int height);
 
-    static QHash<QString, QSGDistanceFieldGlyphCache *> m_caches;
+    static QHash<QPair<const QGLContext *, QFontEngine *>, QSGDistanceFieldGlyphCache *> m_caches;
 
     QRawFont m_font;
     QRawFont m_referenceFont;
 
-    QString m_distanceFieldKey;
     int m_glyphCount;
     QHash<glyph_t, Metrics> m_metrics;
     mutable int m_maxTextureSize;
@@ -145,7 +144,7 @@ private:
     };
     DistanceFieldTextureData *textureData();
     DistanceFieldTextureData *m_textureData;
-    static QHash<QString, QGLContextGroupResource<DistanceFieldTextureData> > m_textures_data;
+    static QHash<QFontEngine *, QGLContextGroupResource<DistanceFieldTextureData> > m_textures_data;
 
     const QGLContext *ctx;
     QGLShaderProgram *m_blitProgram;