From a34077ceac6a3e436328fcfb444e20111455a885 Mon Sep 17 00:00:00 2001
From: Andy Shaw <andy.shaw@qt.io>
Date: Wed, 13 Feb 2019 15:42:11 +0100
Subject: [PATCH] Windows: Freetype: Load fonts from the user locations

Since Windows 10 update 1809 it is possible to install fonts as a user
so they are only available for use by the user and not on the system.
So this location in the registry needs to be checked as well when
looking for available fonts.

Fixes: QTBUG-73241
Change-Id: I5d808e38b80dde8189fe8c549a6524bd559e30c7
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
---
 .../windows/qwindowsfontdatabase_ft.cpp       | 45 ++++++++++---------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp
index f68ea54dcf4..db2186644bb 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp
@@ -115,30 +115,33 @@ static FontKeys &fontKeys()
 {
     static FontKeys result;
     if (result.isEmpty()) {
-        const QSettings fontRegistry(QStringLiteral("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts"),
-                                     QSettings::NativeFormat);
-        const QStringList allKeys = fontRegistry.allKeys();
-        const QString trueType = QStringLiteral("(TrueType)");
+        const QStringList keys = { QStringLiteral("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts"),
+                                   QStringLiteral("HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts") };
+        for (const auto key : keys) {
+            const QSettings fontRegistry(key, QSettings::NativeFormat);
+            const QStringList allKeys = fontRegistry.allKeys();
+            const QString trueType = QStringLiteral("(TrueType)");
 #if QT_CONFIG(regularexpression)
-        const QRegularExpression sizeListMatch(QStringLiteral("\\s(\\d+,)+\\d+"));
+            const QRegularExpression sizeListMatch(QStringLiteral("\\s(\\d+,)+\\d+"));
 #else
-        const QRegExp sizeListMatch(QLatin1String("\\s(\\d+,)+\\d+"));
+            const QRegExp sizeListMatch(QLatin1String("\\s(\\d+,)+\\d+"));
 #endif
-        Q_ASSERT(sizeListMatch.isValid());
-        const int size = allKeys.size();
-        result.reserve(size);
-        for (int i = 0; i < size; ++i) {
-            FontKey fontKey;
-            const QString &registryFontKey = allKeys.at(i);
-            fontKey.fileName = fontRegistry.value(registryFontKey).toString();
-            QString realKey = registryFontKey;
-            realKey.remove(trueType);
-            realKey.remove(sizeListMatch);
-            const auto fontNames = QStringRef(&realKey).trimmed().split(QLatin1Char('&'));
-            fontKey.fontNames.reserve(fontNames.size());
-            for (const QStringRef &fontName : fontNames)
-                fontKey.fontNames.append(fontName.trimmed().toString());
-            result.append(fontKey);
+            Q_ASSERT(sizeListMatch.isValid());
+            const int size = allKeys.size();
+            result.reserve(result.size() + size);
+            for (int i = 0; i < size; ++i) {
+                FontKey fontKey;
+                const QString &registryFontKey = allKeys.at(i);
+                fontKey.fileName = fontRegistry.value(registryFontKey).toString();
+                QString realKey = registryFontKey;
+                realKey.remove(trueType);
+                realKey.remove(sizeListMatch);
+                const auto fontNames = QStringRef(&realKey).trimmed().split(QLatin1Char('&'));
+                fontKey.fontNames.reserve(fontNames.size());
+                for (const QStringRef &fontName : fontNames)
+                    fontKey.fontNames.append(fontName.trimmed().toString());
+                result.append(fontKey);
+            }
         }
     }
     return result;