Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I2811ff0b9d4097f0be60ff16e9664a5060cff23e

1 files changed, 9 insertions, 0 deletions

diff --git a/src/widgets/dialogs/qfontdialog.cpp b/src/widgets/dialogs/qfontdialog.cpp
index 5a68bfbc66..fc9f36f0c2 100644
--- a/src/widgets/dialogs/qfontdialog.cpp
+++ b/src/widgets/dialogs/qfontdialog.cpp
@@ -65,6 +65,10 @@
 #include <private/qdialog_p.h>
 #include <private/qfont_p.h>
 
+#include <QtGui/private/qguiapplication_p.h>
+#include <qpa/qplatformintegration.h>
+#include <qpa/qplatformfontdatabase.h>
+
 QT_BEGIN_NAMESPACE
 
 class QFontListView : public QListView
@@ -485,8 +489,13 @@ void QFontDialogPrivate::updateFamilies()
     const QFontDialog::FontDialogOptions spacingMask = (QFontDialog::ProportionalFonts | QFontDialog::MonospacedFonts);
     const QFontDialog::FontDialogOptions options = q->options();
 
+    QPlatformFontDatabase *pfdb = QGuiApplicationPrivate::platformIntegration()->fontDatabase();
+
     QStringList familyNames;
     foreach (const QString &family, fdb.families(writingSystem)) {
+        if (pfdb->isPrivateFontFamily(family))
+            continue;
+
         if ((options & scalableMask) && (options & scalableMask) != scalableMask) {
             if (bool(options & QFontDialog::ScalableFonts) != fdb.isSmoothlyScalable(family))
                 continue;