summaryrefslogtreecommitdiffstats
path: root/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2016-10-28 14:11:21 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2016-10-28 14:14:28 +0000
commit8cd812455932f896b45aae84c4dc571f60f60b25 (patch)
tree6c2365856023fbd06c803dbd2607c9226d33bb5c /src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
parente5451f086bb9551527a4f0da06525eef860a53a9 (diff)
Windows QPA: Do not use QSettings to access the registry
When commenting out the warning in createOrOpenKey() (src\corelib\io\qsettings_win.cpp:157), applications produce warnings: QSettings: Failed to create subkey "Software\Microsoft\Windows NT\CurrentVersion\FontSubstitutes": Access is denied. indicating that an attempt to open the registry in read/write mode fails. Add a utility function to read out registry strings in read-only mode to the font database and use that instead. Change-Id: I4187344cac7ec2ba27f15b51e237575efc171853 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h')
-rw-r--r--src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
index d240f77a66..b7ebfc033f 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
@@ -130,6 +130,8 @@ public:
static void setFontOptions(unsigned options);
static unsigned fontOptions();
+ static QString readRegistryString(HKEY parentHandle, const wchar_t *keyPath, const wchar_t *keyName);
+
private:
void populateFamily(const QString &familyName, bool registerAlias);
void removeApplicationFonts();