summaryrefslogtreecommitdiffstats
path: root/src/gui/text/windows
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>2022-02-04 13:40:02 +0100
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>2022-02-09 15:33:45 +0100
commitd4de57de4266963fcec6064a7c047449aab1f609 (patch)
tree5f269042a1ebdd8ca4268b88ffdd9fb5e96e19a4 /src/gui/text/windows
parent90b07054f6de3ad101416b1ab5a10d7fee801a1c (diff)
Fix regression when displaying emojis on Windows
This amends b0e8ba783b6c6225fcedf5130726ee43f8ce1aa4. A copy-paste error accidentally broke emojis on Windows. Change-Id: I758572604370d170b8effd6c0ff97e09489fafa4 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Diffstat (limited to 'src/gui/text/windows')
-rw-r--r--src/gui/text/windows/qwindowsfontenginedirectwrite.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/windows/qwindowsfontenginedirectwrite.cpp b/src/gui/text/windows/qwindowsfontenginedirectwrite.cpp
index 8323cde41a..e123c1fd57 100644
--- a/src/gui/text/windows/qwindowsfontenginedirectwrite.cpp
+++ b/src/gui/text/windows/qwindowsfontenginedirectwrite.cpp
@@ -776,7 +776,7 @@ QImage QWindowsFontEngineDirectWrite::imageForGlyph(glyph_t t,
IDWriteGlyphRunAnalysis *colorGlyphsAnalysis = NULL;
hr = factory2->CreateGlyphRunAnalysis(
- &glyphRun,
+ &colorGlyphRun->glyphRun,
&transform,
renderMode,
measureMode,