summaryrefslogtreecommitdiffstats
path: root/src/widgets/kernel/qwidget_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets/kernel/qwidget_p.h')
-rw-r--r--src/widgets/kernel/qwidget_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h
index f6a1ee539d..d27a955c81 100644
--- a/src/widgets/kernel/qwidget_p.h
+++ b/src/widgets/kernel/qwidget_p.h
@@ -313,7 +313,7 @@ public:
void updateFont(const QFont &);
inline void setFont_helper(const QFont &font) {
- if (directFontResolveMask == font.resolve() && data.fnt == font)
+ if (directFontResolveMask == font.resolveMask() && data.fnt == font)
return;
updateFont(font);
}
@@ -682,7 +682,7 @@ public:
// Other variables.
uint directFontResolveMask;
uint inheritedFontResolveMask;
- decltype(std::declval<QPalette>().resolve()) directPaletteResolveMask;
+ decltype(std::declval<QPalette>().resolveMask()) directPaletteResolveMask;
QPalette::ResolveMask inheritedPaletteResolveMask;
short leftmargin;
short topmargin;