1 files changed, 11 insertions, 1 deletions
diff --git a/src/gui/text/qfontdatabase_p.h b/src/gui/text/qfontdatabase_p.h
index b40a651bbb..72fda436e8 100644
--- a/src/gui/text/qfontdatabase_p.h
+++ b/src/gui/text/qfontdatabase_p.h
@@ -16,12 +16,16 @@
 //
 
 #include <QtCore/qcache.h>
+#include <QtCore/qloggingcategory.h>
 
 #include <QtGui/qfontdatabase.h>
 #include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
+Q_DECLARE_LOGGING_CATEGORY(lcFontDb)
+Q_DECLARE_LOGGING_CATEGORY(lcFontMatch)
+
 struct QtFontDesc;
 
 struct QtFontFallbacksCacheKey
@@ -174,7 +178,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 +208,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(); }