aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@qt.io>2019-11-11 15:38:21 +0100
committerAndy Shaw <andy.shaw@qt.io>2019-11-11 15:43:52 +0100
commit0622cb603869484c93acf6369965ec2eabd9ef6f (patch)
tree52f02ef88b3643ac5c7a90289415304472d0ef4f
parentc8dd650616278fda0f79bd237833de1ade5d947a (diff)
Amend d1fec8f050fc8f60b2cc2bf0e22a1e478f0e9048 to account for the theme5.13
Fixes: QTBUG-79929 Change-Id: I153684fa9c4e40d220986391671b0945b66393e1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--src/quicktemplates2/qquicktheme.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquicktheme.cpp b/src/quicktemplates2/qquicktheme.cpp
index af49ffc9..1228714b 100644
--- a/src/quicktemplates2/qquicktheme.cpp
+++ b/src/quicktemplates2/qquicktheme.cpp
@@ -167,6 +167,8 @@ void QQuickTheme::setFont(Scope scope, const QFont &font)
{
Q_D(QQuickTheme);
d->fonts[scope] = QSharedPointer<QFont>::create(d->defaultFont ? d->defaultFont->resolve(font) : font);
+ // See comment in QQuickControlPrivate::inheritFont
+ d->fonts[scope]->setFamilies(QStringList());
}
void QQuickTheme::setPalette(Scope scope, const QPalette &palette)