1 files changed, 13 insertions, 5 deletions
diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp
index 215eb75e32..70d70e342a 100644
--- a/src/gui/painting/qtextureglyphcache.cpp
+++ b/src/gui/painting/qtextureglyphcache.cpp
@@ -57,13 +57,14 @@ int QTextureGlyphCache::calculateSubPixelPositionCount(glyph_t glyph) const
 }
 
 bool QTextureGlyphCache::populate(QFontEngine *fontEngine,
-                                  int numGlyphs,
+                                  qsizetype numGlyphs,
                                   const glyph_t *glyphs,
                                   const QFixedPoint *positions,
-                                  QPainter::RenderHints renderHints)
+                                  QPainter::RenderHints renderHints,
+                                  bool includeGlyphCacheScale)
 {
 #ifdef CACHE_DEBUG
-    printf("Populating with %d glyphs\n", numGlyphs);
+    printf("Populating with %lld glyphs\n", static_cast<long long>(numGlyphs));
     qDebug() << " -> current transformation: " << m_transform;
 #endif
 
@@ -78,7 +79,7 @@ bool QTextureGlyphCache::populate(QFontEngine *fontEngine,
         if (!supportsSubPixelPositions) {
             fontEngine->m_subPixelPositionCount = 1;
         } else {
-            int i = 0;
+            qsizetype i = 0;
             while (fontEngine->m_subPixelPositionCount == 0 && i < numGlyphs)
                 fontEngine->m_subPixelPositionCount = calculateSubPixelPositionCount(glyphs[i++]);
         }
@@ -89,16 +90,23 @@ bool QTextureGlyphCache::populate(QFontEngine *fontEngine,
         m_cy = padding;
     }
 
+    qreal glyphCacheScaleX = transform().m11();
+    qreal glyphCacheScaleY = transform().m22();
+
     QHash<GlyphAndSubPixelPosition, Coord> listItemCoordinates;
     int rowHeight = 0;
 
     // check each glyph for its metrics and get the required rowHeight.
-    for (int i=0; i < numGlyphs; ++i) {
+    for (qsizetype i = 0; i < numGlyphs; ++i) {
         const glyph_t glyph = glyphs[i];
 
         QFixedPoint subPixelPosition;
         if (supportsSubPixelPositions) {
             QFixedPoint pos = positions != nullptr ? positions[i] : QFixedPoint();
+            if (includeGlyphCacheScale) {
+                pos = QFixedPoint(QFixed::fromReal(pos.x.toReal() * glyphCacheScaleX),
+                                  QFixed::fromReal(pos.y.toReal() * glyphCacheScaleY));
+            }
             subPixelPosition = fontEngine->subPixelPositionFor(pos);
             if (!verticalSubPixelPositions)
                 subPixelPosition.y = 0;