diff options
Diffstat (limited to 'src/quicktemplates2/qquicklabel.cpp')
| -rw-r--r-- | src/quicktemplates2/qquicklabel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquicklabel.cpp b/src/quicktemplates2/qquicklabel.cpp index 144d2fe7..183b0f80 100644 --- a/src/quicktemplates2/qquicklabel.cpp +++ b/src/quicktemplates2/qquicklabel.cpp @@ -180,7 +180,7 @@ void QQuickLabelPrivate::resolveFont() void QQuickLabelPrivate::inheritFont(const QFont &font) { QFont parentFont = extra.isAllocated() ? extra->requestedFont.resolve(font) : font; - parentFont.resolve(extra.isAllocated() ? extra->requestedFont.resolve() | font.resolve() : font.resolve()); + parentFont.setResolveMask(extra.isAllocated() ? extra->requestedFont.resolveMask() | font.resolveMask() : font.resolveMask()); const QFont defaultFont = QQuickTheme::font(QQuickTheme::Label); QFont resolvedFont = parentFont.resolve(defaultFont); @@ -329,7 +329,7 @@ QFont QQuickLabel::font() const void QQuickLabel::setFont(const QFont &font) { Q_D(QQuickLabel); - if (d->extra.value().requestedFont.resolve() == font.resolve() && d->extra.value().requestedFont == font) + if (d->extra.value().requestedFont.resolveMask() == font.resolveMask() && d->extra.value().requestedFont == font) return; d->extra.value().requestedFont = font; |