summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2016-11-07 14:37:58 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-11-23 10:04:47 +0000
commit9204b8c31ea1b5f0c05870c5b5d74c33b1a4f622 (patch)
treee86eaa69aa39a94ec7d243c831c18f6122e3de03 /src/plugins/platforms
parent53686bf86db1c2695ee16b903e4b86cc3ee74006 (diff)
Register fonts with preferred names on Windows
Looks up the canonical names of enumerated fonts and register them under their preferred names if present. Also changes the logic handling registration of english aliases, so it is always done, even if it might in rare cases cause a double registration since that is safe. Task-number: QTBUG-53458 Change-Id: Ia010774b26072192b55697b717cc37442c852881 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/plugins/platforms')
-rw-r--r--src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp
index 69d2e12778..c4ff937a0b 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp
@@ -1037,7 +1037,7 @@ public:
if (fontFace)
return fontFace;
- LOGFONT lf = QWindowsFontDatabase::fontDefToLOGFONT(fontDef);
+ LOGFONT lf = QWindowsFontDatabase::fontDefToLOGFONT(fontDef, QString());
// Get substitute name
static const char keyC[] = "HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows NT\\CurrentVersion\\FontSubstitutes";