Fix font fallback rendering incorrect glyphsHEADdev

The fallback glyph runs were not accounted for when generating
the glyphs to textures.

Pick-to: 6.11
Change-Id: I7d6c38c6d915d25e7db9eec2a4910a20290ae0ee
Reviewed-by: Paul Olav Tvete <[email protected]>

1 files changed, 1 insertions, 1 deletions

diff --git a/src/canvaspainter/engine/qcdistancefieldglyphcache.cpp b/src/canvaspainter/engine/qcdistancefieldglyphcache.cpp
index 73473e8..ab0945c 100644
--- a/src/canvaspainter/engine/qcdistancefieldglyphcache.cpp
+++ b/src/canvaspainter/engine/qcdistancefieldglyphcache.cpp
@@ -71,7 +71,6 @@ QCDistanceFieldGlyphCache::generate(const QString &text, const QRectF &rect, con
         cache = new QCRhiDistanceFieldGlyphCache(m_rhi);
         FontKeyData f{ nullptr, cache, {} };
         m_glyphCaches.insert(key, std::move(f));
-        cache->setRawFont(rFont);
         data = &m_glyphCaches[key];
     }
 
@@ -114,6 +113,7 @@ QCDistanceFieldGlyphCache::generate(const QString &text, const QRectF &rect, con
     qsizetype index = 0;
     const QPointF glyphPos(rect.x(), rect.y() + textY);
     for (const auto &run : std::as_const(glyphRuns)) {
+        cache->setRawFont(run.rawFont());
         cache->addGlyphs(glyphPos, run);
         cache->update();