aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/universal
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@qt.io>2020-11-25 14:00:11 +0100
committerAndy Shaw <andy.shaw@qt.io>2020-11-30 07:36:07 +0100
commite32947d25245bdf5ca9b969e82c4e66de48957bb (patch)
tree4eaef81431c370d1c39d340a6a79144f82155315 /src/imports/controls/universal
parent198db199e5e9f7f6bf8c2a8fdd870d46c5615256 (diff)
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>
Diffstat (limited to 'src/imports/controls/universal')
-rw-r--r--src/imports/controls/universal/qquickuniversaltheme.cpp8
1 files changed, 4 insertions, 4 deletions
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);