1 files changed, 12 insertions, 5 deletions

diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
index 8ac92527d1..df0592cad1 100644
--- a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
@@ -274,7 +274,8 @@ bool QSG24BitTextMaskRhiShader::updateGraphicsPipelineState(RenderState &state,
     ps->srcColor = GraphicsPipelineState::ConstantColor;
     ps->dstColor = GraphicsPipelineState::OneMinusSrcColor;
 
-    QVector4D color = qsg_premultiply(mat->color(), state.opacity());
+    QVector4D color = mat->color();
+
     //        if (useSRGB())
     //            color = qt_sRGB_to_linear_RGB(color);
 
@@ -456,7 +457,7 @@ void QSGTextMaskMaterial::updateCache(QFontEngine::GlyphFormat glyphFormat)
         QColor color = glyphFormat == QFontEngine::Format_ARGB ? QColor::fromRgbF(m_color.x(), m_color.y(), m_color.z(), m_color.w()) : QColor();
         m_glyphCache = fontEngine->glyphCache(cacheKey, glyphFormat, glyphCacheTransform, color);
         if (!m_glyphCache || int(m_glyphCache->glyphFormat()) != glyphFormat) {
-            m_glyphCache = new QSGRhiTextureGlyphCache(m_rhi, glyphFormat, glyphCacheTransform, color);
+            m_glyphCache = new QSGRhiTextureGlyphCache(m_rc, glyphFormat, glyphCacheTransform, color);
             fontEngine->setGlyphCache(cacheKey, m_glyphCache.data());
             m_rc->registerFontengineForCleanup(fontEngine);
         }
@@ -482,8 +483,12 @@ void QSGTextMaskMaterial::populate(const QPointF &p,
     QTextureGlyphCache *cache = glyphCache();
 
     QRawFontPrivate *fontD = QRawFontPrivate::get(m_font);
-    cache->populate(fontD->fontEngine, glyphIndexes.size(), glyphIndexes.constData(),
-                    fixedPointPositions.data());
+    cache->populate(fontD->fontEngine,
+                    glyphIndexes.size(),
+                    glyphIndexes.constData(),
+                    fixedPointPositions.data(),
+                    QPainter::RenderHints(),
+                    true);
     cache->fillInPendingGlyphs();
 
     int margin = fontD->fontEngine->glyphMargin(cache->glyphFormat());
@@ -503,9 +508,11 @@ void QSGTextMaskMaterial::populate(const QPointF &p,
     bool supportsSubPixelPositions = fontD->fontEngine->supportsHorizontalSubPixelPositions();
     for (int i=0; i<glyphIndexes.size(); ++i) {
          QPointF glyphPosition = glyphPositions.at(i) + position;
+         QFixedPoint fixedPointPosition = fixedPointPositions.at(i);
+
          QFixed subPixelPosition;
          if (supportsSubPixelPositions)
-             subPixelPosition = fontD->fontEngine->subPixelPositionForX(QFixed::fromReal(glyphPosition.x()));
+             subPixelPosition = fontD->fontEngine->subPixelPositionForX(QFixed::fromReal(fixedPointPosition.x.toReal() * glyphCacheScaleX));
 
          QTextureGlyphCache::GlyphAndSubPixelPosition glyph(glyphIndexes.at(i),
                                                             QFixedPoint(subPixelPosition, 0));