Read font selection flags and use them when querying for metrics

Certain fonts with multiple styles have the same family name. When
loading these as application fonts we were not specific enough when
querying for the text metrics. This meant that e.g. the bold version in
a font family would get the metrics of the regular one.

Fixes: QTBUG-67273
Change-Id: Ic988d62cddde0a1f77ddcaf2891cadc21c9b31e6
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>

1 files changed, 8 insertions, 0 deletions

diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
index ab6d6307c7..9d0aa7f723 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
@@ -177,6 +177,14 @@ struct QFontNames
     QString preferredStyle; // e.g. "Condensed Italic"
 };
 
+struct QFontValues
+{
+    quint16 weight = 0;
+    bool isItalic = false;
+    bool isOverstruck = false;
+    bool isUnderlined = false;
+};
+
 bool qt_localizedName(const QString &name);
 QString qt_getEnglishName(const QString &familyName, bool includeStyle = false);
 QFontNames qt_getCanonicalFontNames(const LOGFONT &lf);