From 1539e8e310ee3da8ae44a4b5b28d0f72b1345eb4 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 13 Jun 2012 12:42:45 +0200 Subject: Windows: Fix warnings about being unable to load fonts from font dir. Do not call QPlatformFontDatabase::populateFontDatabase(), which tries to load qpf2-fonts from the Qt library directory. This directory is not installed on Windows. Note: This affects non-in-source builds only. Task-number: QTBUG-26066 Change-Id: I5782e61965958fc48e0edd7a3d50eef325529708 Reviewed-by: Miikka Heikkinen Reviewed-by: Friedemann Kleint --- src/plugins/platforms/windows/qwindowsfontdatabase.cpp | 1 - src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp index 445b40f499..a27386c2ad 100644 --- a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp +++ b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp @@ -1075,7 +1075,6 @@ void QWindowsFontDatabase::populateFontDatabase() { m_families.clear(); removeApplicationFonts(); - QPlatformFontDatabase::populateFontDatabase(); populate(); // Called multiple times. // Work around EnumFontFamiliesEx() not listing the system font, see below. const QString sysFontFamily = QGuiApplication::font().family(); diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp index 42d30f1833..ab85b58ce0 100644 --- a/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp +++ b/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp @@ -278,7 +278,6 @@ static int CALLBACK storeFont(ENUMLOGFONTEX* f, NEWTEXTMETRICEX *textmetric, void QWindowsFontDatabaseFT::populateFontDatabase() { m_families.clear(); - QPlatformFontDatabase::populateFontDatabase(); populate(); // Called multiple times. // Work around EnumFontFamiliesEx() not listing the system font, see below. const QString sysFontFamily = QGuiApplication::font().family(); -- cgit v1.2.3