Make adjustments for using QFont::setFamilies()

Since we only depend on using setFamilies() now instead of setFamily()
then we can rely on the fact that it will be resolved correctly, so we
can remove the code that was ensuring that family() would take
precedence if families() was empty.

Change-Id: Iea1464ec840dc76c04a4acae445cab367e03d3ca
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

3 files changed, 15 insertions, 14 deletions

diff --git a/src/imports/controls/imagine/qquickimaginetheme.cpp b/src/imports/controls/imagine/qquickimaginetheme.cpp
index a9722fa5..7bae036a 100644
--- a/src/imports/controls/imagine/qquickimaginetheme.cpp
+++ b/src/imports/controls/imagine/qquickimaginetheme.cpp
@@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE
 void QQuickImagineTheme::initialize(QQuickTheme *theme)
 {
     QFont systemFont;
-    systemFont.setFamily(QLatin1String("Open Sans"));
+    systemFont.setFamilies(QStringList{QLatin1String("Open Sans")});
     theme->setFont(QQuickTheme::System, systemFont);
 
     const QColor accentColor = QColor::fromRgb(0x4fc1e9);
diff --git a/src/imports/controls/material/qquickmaterialtheme.cpp b/src/imports/controls/material/qquickmaterialtheme.cpp
index f42c0a03..aec9e232 100644
--- a/src/imports/controls/material/qquickmaterialtheme.cpp
+++ b/src/imports/controls/material/qquickmaterialtheme.cpp
@@ -55,22 +55,23 @@ void QQuickMaterialTheme::initialize(QQuickTheme *theme)
     QFont editorFont;
 
     QFont font;
-    font.setFamily(QLatin1String("Roboto"));
+    font.setFamilies(QStringList{QLatin1String("Roboto")});
     QString family = QFontInfo(font).family();
 
     if (family != QLatin1String("Roboto")) {
-        font.setFamily(QLatin1String("Noto"));
+        font.setFamilies(QStringList{QLatin1String("Noto")});
         family = QFontInfo(font).family();
     }
 
     if (family == QLatin1String("Roboto") || family == QLatin1String("Noto")) {
-        systemFont.setFamily(family);
-        buttonFont.setFamily(family);
-        toolTipFont.setFamily(family);
-        itemViewFont.setFamily(family);
-        listViewFont.setFamily(family);
-        menuItemFont.setFamily(family);
-        editorFont.setFamily(family);
+        const QStringList families{family};
+        systemFont.setFamilies(families);
+        buttonFont.setFamilies(families);
+        toolTipFont.setFamilies(families);
+        itemViewFont.setFamilies(families);
+        listViewFont.setFamilies(families);
+        menuItemFont.setFamilies(families);
+        editorFont.setFamilies(families);
     }
 
     const bool dense = QQuickMaterialStyle::variant() == QQuickMaterialStyle::Dense;
diff --git a/src/imports/controls/universal/qquickuniversaltheme.cpp b/src/imports/controls/universal/qquickuniversaltheme.cpp
index 041dce9e..46f7c52e 100644
--- a/src/imports/controls/universal/qquickuniversaltheme.cpp
+++ b/src/imports/controls/universal/qquickuniversaltheme.cpp
@@ -49,10 +49,10 @@ void QQuickUniversalTheme::initialize(QQuickTheme *theme)
 
     const QFont font(QLatin1String("Segoe UI"));
     if (QFontInfo(font).family() == QLatin1String("Segoe UI")) {
-        const QString family = font.family();
-        systemFont.setFamily(family);
-        groupBoxTitleFont.setFamily(family);
-        tabButtonFont.setFamily(family);
+        const QStringList families{font.family()};
+        systemFont.setFamilies(families);
+        groupBoxTitleFont.setFamilies(families);
+        tabButtonFont.setFamilies(families);
     }
 
     systemFont.setPixelSize(15);