From e32947d25245bdf5ca9b969e82c4e66de48957bb Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Wed, 25 Nov 2020 14:00:11 +0100 Subject: 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 --- src/imports/controls/universal/qquickuniversaltheme.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/imports/controls/universal') 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); -- cgit v1.2.3