1 files changed, 6 insertions, 12 deletions

diff --git a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h
index 9ad99e5c54..57dc4a5d07 100644
--- a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h
+++ b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h
@@ -72,10 +72,10 @@ public:
     QSGDefaultDistanceFieldGlyphCache(QSGDistanceFieldGlyphCacheManager *man, QOpenGLContext *c, const QRawFont &font);
     virtual ~QSGDefaultDistanceFieldGlyphCache();
 
-    void requestGlyphs(const QSet<glyph_t> &glyphs);
-    void storeGlyphs(const QList<QDistanceField> &glyphs);
-    void referenceGlyphs(const QSet<glyph_t> &glyphs);
-    void releaseGlyphs(const QSet<glyph_t> &glyphs);
+    void requestGlyphs(const QSet<glyph_t> &glyphs) override;
+    void storeGlyphs(const QList<QDistanceField> &glyphs) override;
+    void referenceGlyphs(const QSet<glyph_t> &glyphs) override;
+    void releaseGlyphs(const QSet<glyph_t> &glyphs) override;
 
     bool useTextureResizeWorkaround() const;
     bool useTextureUploadWorkaround() const;
@@ -119,19 +119,13 @@ private:
             const QString source = QLatin1String(qopenglslMainWithTexCoordsVertexShader)
                                  + QLatin1String(qopenglslUntransformedPositionVertexShader);
 
-            QOpenGLShader *vertexShader = new QOpenGLShader(QOpenGLShader::Vertex, m_blitProgram);
-            vertexShader->compileSourceCode(source);
-
-            m_blitProgram->addShader(vertexShader);
+            m_blitProgram->addCacheableShaderFromSourceCode(QOpenGLShader::Vertex, source);
         }
         {
             const QString source = QLatin1String(qopenglslMainFragmentShader)
                                  + QLatin1String(qopenglslImageSrcFragmentShader);
 
-            QOpenGLShader *fragmentShader = new QOpenGLShader(QOpenGLShader::Fragment, m_blitProgram);
-            fragmentShader->compileSourceCode(source);
-
-            m_blitProgram->addShader(fragmentShader);
+            m_blitProgram->addCacheableShaderFromSourceCode(QOpenGLShader::Fragment, source);
         }
         m_blitProgram->bindAttributeLocation("vertexCoordsArray", QT_VERTEX_COORDS_ATTR);
         m_blitProgram->bindAttributeLocation("textureCoordArray", QT_TEXTURE_COORDS_ATTR);