Windows: Introduce delayed population to the FreeType font database.

Further Split apart Windows CE/Windows code paths to provide 2
implementations of populateFontDatabase():

- The desktop version uses a callback which only
  registers the font families using
  QPlatformFontDatabase::registerFontFamily() to be
  populated on demand later by populateFamily().

- The Windows CE version is unchanged.

Task-number: QTBUG-43774
Task-number: QTBUG-44647
Change-Id: Iad4ec849006a4daf86a5caea9afc89e83ccc7c63
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>

1 files changed, 1 insertions, 5 deletions

diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase_ft.h b/src/plugins/platforms/windows/qwindowsfontdatabase_ft.h
index 7552458a9f..ad5c005ffa 100644
--- a/src/plugins/platforms/windows/qwindowsfontdatabase_ft.h
+++ b/src/plugins/platforms/windows/qwindowsfontdatabase_ft.h
@@ -44,6 +44,7 @@ class QWindowsFontDatabaseFT : public QBasicFontDatabase
 {
 public:
     void populateFontDatabase();
+    void populateFamily(const QString &familyName) Q_DECL_OVERRIDE;
     QFontEngine *fontEngine(const QFontDef &fontDef, void *handle);
     QFontEngine *fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference);
 
@@ -51,11 +52,6 @@ public:
 
     QString fontDir() const Q_DECL_OVERRIDE;
     QFont defaultFont() const Q_DECL_OVERRIDE;
-
-private:
-    void populate(const QString &family = QString());
-
-    QSet<QString> m_families;
 };
 
 QT_END_NAMESPACE