1 files changed, 7 insertions, 1 deletions
diff --git a/src/gui/text/qfontdatabase_p.h b/src/gui/text/qfontdatabase_p.h
index b40a651bbb..38e1b4ad20 100644
--- a/src/gui/text/qfontdatabase_p.h
+++ b/src/gui/text/qfontdatabase_p.h
@@ -174,7 +174,7 @@ struct Q_GUI_EXPORT QtFontFamily
     bool matchesFamilyName(const QString &familyName) const;
     QtFontFoundry *foundry(const QString &f, bool = false);
 
-    void ensurePopulated();
+    bool ensurePopulated();
 };
 
 class Q_GUI_EXPORT QFontDatabasePrivate
@@ -204,9 +204,15 @@ public:
     QtFontFamily **families;
     bool populated = false;
 
+    QHash<QChar::Script, QStringList> applicationFallbackFontFamilies;
+
     QCache<QtFontFallbacksCacheKey, QStringList> fallbacksCache;
     struct ApplicationFont {
         QString fileName;
+
+        // Note: The data may be implicitly shared throughout the
+        // font database and platform font database, so be careful
+        // to never detach when accessing this member!
         QByteArray data;
 
         bool isNull() const { return fileName.isEmpty(); }