diff options
Diffstat (limited to 'src/templates/qquickapplicationwindow.cpp')
| -rw-r--r-- | src/templates/qquickapplicationwindow.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/templates/qquickapplicationwindow.cpp b/src/templates/qquickapplicationwindow.cpp index 9a9e5460..309c8d3a 100644 --- a/src/templates/qquickapplicationwindow.cpp +++ b/src/templates/qquickapplicationwindow.cpp @@ -396,7 +396,7 @@ QFont QQuickApplicationWindow::font() const void QQuickApplicationWindow::setFont(const QFont &f) { Q_D(QQuickApplicationWindow); - if (d->font == f) + if (d->font.resolve() == f.resolve() && d->font == f) return; QFont resolvedFont = f.resolve(QQuickControlPrivate::themeFont(QPlatformTheme::SystemFont)); @@ -417,11 +417,13 @@ void QQuickApplicationWindowPrivate::resolveFont() void QQuickApplicationWindowPrivate::updateFont(const QFont &f) { Q_Q(QQuickApplicationWindow); + const bool changed = font != f; font = f; QQuickControlPrivate::updateFontRecur(q->contentItem(), f); - emit q->fontChanged(); + if (changed) + emit q->fontChanged(); } QLocale QQuickApplicationWindow::locale() const |