diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-14 09:52:30 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-14 09:52:30 +0100 |
| commit | e350aa83978e4a142d1e7c6433dfe37ddb0e71a8 (patch) | |
| tree | 499362377362e05202869901ad175c3f3ea81260 | |
| parent | 9c05807b951167bc0c8385811c9df1bd9d48ca6d (diff) | |
| parent | 0622cb603869484c93acf6369965ec2eabd9ef6f (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I2e33f9f4f508b98c26659574135fba9ff721d53b
| -rw-r--r-- | src/quicktemplates2/qquicktheme.cpp | 2 |
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) |