Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev

2 files changed, 15 insertions, 11 deletions

diff --git a/tests/auto/widgets/widgets/qfontcombobox/BLACKLIST b/tests/auto/widgets/widgets/qfontcombobox/BLACKLIST
deleted file mode 100644
index 8bd4caad31..0000000000
--- a/tests/auto/widgets/widgets/qfontcombobox/BLACKLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-[currentFont]
-osx
-[fontFilters]
-osx
-[writingSystem]
-osx
diff --git a/tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp b/tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp
index cda24a19d3..9e6b16d4ce 100644
--- a/tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp
+++ b/tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp
@@ -80,18 +80,21 @@ void tst_QFontComboBox::qfontcombobox()
 void tst_QFontComboBox::currentFont_data()
 {
     QTest::addColumn<QFont>("currentFont");
+    QFontDatabase db;
     // Normalize the names
     QFont defaultFont;
     QFontInfo fi(defaultFont);
     defaultFont = QFont(fi.family()); // make sure we have a real font name and not something like 'Sans Serif'.
-    QTest::newRow("default") << defaultFont;
+    if (!db.isPrivateFamily(defaultFont.family()))
+        QTest::newRow("default") << defaultFont;
     defaultFont.setPointSize(defaultFont.pointSize() + 10);
-    QTest::newRow("default2") << defaultFont;
-    QFontDatabase db;
+    if (!db.isPrivateFamily(defaultFont.family()))
+        QTest::newRow("default2") << defaultFont;
     QStringList list = db.families();
     for (int i = 0; i < list.count(); ++i) {
         QFont f = QFont(QFontInfo(QFont(list.at(i))).family());
-        QTest::newRow(qPrintable(list.at(i))) << f;
+        if (!db.isPrivateFamily(f.family()))
+            QTest::newRow(qPrintable(list.at(i))) << f;
     }
 }
 
@@ -168,6 +171,8 @@ void tst_QFontComboBox::fontFilters()
         fontFilters &= ~spacingMask;
 
     for (int i = 0; i < list.count(); ++i) {
+        if (db.isPrivateFamily(list[i]))
+            continue;
         if (fontFilters & QFontComboBox::ScalableFonts) {
             if (!db.isSmoothlyScalable(list[i]))
                 continue;
@@ -232,7 +237,12 @@ void tst_QFontComboBox::writingSystem()
 
     QFontDatabase db;
     QStringList list = db.families(writingSystem);
-    QCOMPARE(box.model()->rowCount(), list.count());
+    int c = list.count();
+    for (int i = 0; i < list.count(); ++i) {
+        if (db.isPrivateFamily(list[i]))
+            c--;
+    }
+    QCOMPARE(box.model()->rowCount(), c);
 
     if (list.count() == 0)
         QCOMPARE(box.currentFont(), QFont());