diff options
-rw-r--r-- | src/imports/controls/fusion/qquickfusionstyle.cpp | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickapplicationwindow.cpp | 4 | ||||
-rw-r--r-- | src/quicktemplates2/qquickcontrol.cpp | 4 | ||||
-rw-r--r-- | src/quicktemplates2/qquickcontrol_p_p.h | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquicklabel.cpp | 4 | ||||
-rw-r--r-- | src/quicktemplates2/qquicklabel_p_p.h | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquicktextarea.cpp | 4 | ||||
-rw-r--r-- | src/quicktemplates2/qquicktextarea_p_p.h | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquicktextfield.cpp | 4 | ||||
-rw-r--r-- | src/quicktemplates2/qquicktextfield_p_p.h | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquicktheme.cpp | 4 |
11 files changed, 18 insertions, 16 deletions
diff --git a/src/imports/controls/fusion/qquickfusionstyle.cpp b/src/imports/controls/fusion/qquickfusionstyle.cpp index 95064aa4..f2e8f823 100644 --- a/src/imports/controls/fusion/qquickfusionstyle.cpp +++ b/src/imports/controls/fusion/qquickfusionstyle.cpp @@ -149,3 +149,5 @@ QColor QQuickFusionStyle::grooveColor(QQuickPalette *palette) } QT_END_NAMESPACE + +#include "moc_qquickfusionstyle_p.cpp" diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp index 3d39a04e..c825a063 100644 --- a/src/quicktemplates2/qquickapplicationwindow.cpp +++ b/src/quicktemplates2/qquickapplicationwindow.cpp @@ -147,7 +147,7 @@ public: void updateFont(const QFont &f); inline void setFont_helper(const QFont &f) { - if (font.resolve() == f.resolve() && font == f) + if (font.resolveMask() == f.resolveMask() && font == f) return; updateFont(f); } @@ -611,7 +611,7 @@ QFont QQuickApplicationWindow::font() const void QQuickApplicationWindow::setFont(const QFont &font) { Q_D(QQuickApplicationWindow); - if (d->font.resolve() == font.resolve() && d->font == font) + if (d->font.resolveMask() == font.resolveMask() && d->font == font) return; QFont resolvedFont = font.resolve(QQuickTheme::font(QQuickTheme::System)); diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp index e9b66d9e..86724369 100644 --- a/src/quicktemplates2/qquickcontrol.cpp +++ b/src/quicktemplates2/qquickcontrol.cpp @@ -559,7 +559,7 @@ void QQuickControlPrivate::inheritFont(const QFont &font) { Q_Q(QQuickControl); 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 = q->defaultFont(); QFont resolvedFont = parentFont.resolve(defaultFont); @@ -973,7 +973,7 @@ QFont QQuickControl::font() const void QQuickControl::setFont(const QFont &font) { Q_D(QQuickControl); - 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; diff --git a/src/quicktemplates2/qquickcontrol_p_p.h b/src/quicktemplates2/qquickcontrol_p_p.h index 116e8745..15d0ef74 100644 --- a/src/quicktemplates2/qquickcontrol_p_p.h +++ b/src/quicktemplates2/qquickcontrol_p_p.h @@ -139,7 +139,7 @@ public: void updateFont(const QFont &font); static void updateFontRecur(QQuickItem *item, const QFont &font); inline void setFont_helper(const QFont &font) { - if (resolvedFont.resolve() == font.resolve() && resolvedFont == font) + if (resolvedFont.resolveMask() == font.resolveMask() && resolvedFont == font) return; updateFont(font); } 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; diff --git a/src/quicktemplates2/qquicklabel_p_p.h b/src/quicktemplates2/qquicklabel_p_p.h index deed89f5..a9bda671 100644 --- a/src/quicktemplates2/qquicklabel_p_p.h +++ b/src/quicktemplates2/qquicklabel_p_p.h @@ -93,7 +93,7 @@ public: void inheritFont(const QFont &font); void updateFont(const QFont &font); inline void setFont_helper(const QFont &font) { - if (sourceFont.resolve() == font.resolve() && sourceFont == font) + if (sourceFont.resolveMask() == font.resolveMask() && sourceFont == font) return; updateFont(font); } diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp index 3495cb02..a740447f 100644 --- a/src/quicktemplates2/qquicktextarea.cpp +++ b/src/quicktemplates2/qquicktextarea.cpp @@ -260,7 +260,7 @@ void QQuickTextAreaPrivate::resolveFont() void QQuickTextAreaPrivate::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::TextArea); QFont resolvedFont = parentFont.resolve(defaultFont); @@ -569,7 +569,7 @@ QFont QQuickTextArea::font() const void QQuickTextArea::setFont(const QFont &font) { Q_D(QQuickTextArea); - 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; diff --git a/src/quicktemplates2/qquicktextarea_p_p.h b/src/quicktemplates2/qquicktextarea_p_p.h index 02c77b07..2ed2b44f 100644 --- a/src/quicktemplates2/qquicktextarea_p_p.h +++ b/src/quicktemplates2/qquicktextarea_p_p.h @@ -98,7 +98,7 @@ public: void inheritFont(const QFont &font); void updateFont(const QFont &font); inline void setFont_helper(const QFont &font) { - if (sourceFont.resolve() == font.resolve() && sourceFont == font) + if (sourceFont.resolveMask() == font.resolveMask() && sourceFont == font) return; updateFont(font); } diff --git a/src/quicktemplates2/qquicktextfield.cpp b/src/quicktemplates2/qquicktextfield.cpp index c8e61094..47026e1b 100644 --- a/src/quicktemplates2/qquicktextfield.cpp +++ b/src/quicktemplates2/qquicktextfield.cpp @@ -222,7 +222,7 @@ void QQuickTextFieldPrivate::resolveFont() void QQuickTextFieldPrivate::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::TextField); QFont resolvedFont = parentFont.resolve(defaultFont); @@ -429,7 +429,7 @@ QFont QQuickTextField::font() const void QQuickTextField::setFont(const QFont &font) { Q_D(QQuickTextField); - 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; diff --git a/src/quicktemplates2/qquicktextfield_p_p.h b/src/quicktemplates2/qquicktextfield_p_p.h index a816614d..d8128972 100644 --- a/src/quicktemplates2/qquicktextfield_p_p.h +++ b/src/quicktemplates2/qquicktextfield_p_p.h @@ -94,7 +94,7 @@ public: void inheritFont(const QFont &font); void updateFont(const QFont &font); inline void setFont_helper(const QFont &font) { - if (sourceFont.resolve() == font.resolve() && sourceFont == font) + if (sourceFont.resolveMask() == font.resolveMask() && sourceFont == font) return; updateFont(font); } diff --git a/src/quicktemplates2/qquicktheme.cpp b/src/quicktemplates2/qquicktheme.cpp index f8c4a251..b80e87e6 100644 --- a/src/quicktemplates2/qquicktheme.cpp +++ b/src/quicktemplates2/qquicktheme.cpp @@ -131,7 +131,7 @@ QFont QQuickTheme::font(Scope scope) if (font) { QFont f = *font; if (scope == System) - f.resolve(0); + f.setResolveMask(0); return f; } @@ -152,7 +152,7 @@ QPalette QQuickTheme::palette(Scope scope) if (palette) { QPalette f = *palette; if (scope == System) - f.resolve(0); + f.setResolveMask(0); return f; } |