diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-08 14:16:41 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-08 14:16:42 +0100 |
| commit | 9c05807b951167bc0c8385811c9df1bd9d48ca6d (patch) | |
| tree | ce5b69e5830c7edaf9014776049038c45dd90c44 /src/quicktemplates2/qquickapplicationwindow.cpp | |
| parent | dc62583e8e1f864b8a22fbe79f9fe25ca3a4e9dc (diff) | |
| parent | c8dd650616278fda0f79bd237833de1ade5d947a (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I551670d92af2bc96d5d8b8724bf5b280e94498c7
Diffstat (limited to 'src/quicktemplates2/qquickapplicationwindow.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickapplicationwindow.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp index 0d05bee7..19f6f82b 100644 --- a/src/quicktemplates2/qquickapplicationwindow.cpp +++ b/src/quicktemplates2/qquickapplicationwindow.cpp @@ -684,6 +684,9 @@ void QQuickApplicationWindow::setFont(const QFont &font) return; QFont resolvedFont = font.resolve(QQuickTheme::font(QQuickTheme::System)); + // See comment in QQuickControlPrivate::inheritFont + if (font.families().isEmpty()) + resolvedFont.setFamilies(QStringList()); d->setFont_helper(resolvedFont); } |