summaryrefslogtreecommitdiffstats
path: root/src/gui/text/windows/qwindowsfontdatabase.cpp
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>2024-02-26 09:29:00 +0100
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>2024-02-26 16:25:17 +0100
commit6bd85d4a27ba2e934fa76a430f2e1d55c08d379d (patch)
tree080df6c0b11a17fd47762ce6b51c54465963ad3d /src/gui/text/windows/qwindowsfontdatabase.cpp
parent3379fd2322d112af4ef7ce75aafe18c27746acae (diff)
Fix color fonts with DirectWrite backend
The logic to detect color fonts in the GDI font database was never implemented in the DirectWrite database, causing emojis to look monochrome. The patch moves this into the font engine itself instead, along with the other initialization code. Pick-to: 6.7 Fixes: QTBUG-122168 Change-Id: I6f5dad579bd987149e613b8071821aaf70a89bc2 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/gui/text/windows/qwindowsfontdatabase.cpp')
-rw-r--r--src/gui/text/windows/qwindowsfontdatabase.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/gui/text/windows/qwindowsfontdatabase.cpp b/src/gui/text/windows/qwindowsfontdatabase.cpp
index 0d84475049..7f7dada056 100644
--- a/src/gui/text/windows/qwindowsfontdatabase.cpp
+++ b/src/gui/text/windows/qwindowsfontdatabase.cpp
@@ -1257,9 +1257,6 @@ QFontEngine *QWindowsFontDatabase::createEngine(const QFontDef &request, const Q
QFontDef fontDef = request;
fontDef.families = QStringList(QString::fromWCharArray(n));
-
- if (isColorFont)
- fedw->glyphFormat = QFontEngine::Format_ARGB;
fedw->initFontInfo(fontDef, dpi);
fe = fedw;
}