Fix QPalette::isBrushSet

The previous implementation did not take into account different color
groups in resolve mask. It led to some issues when resolving a
palette or checking whether a brush is set or not.

Task-number: QTBUG-78544
Change-Id: I9b67b2c444eb62c022643022a874dc400005e6ee
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h
index 6915782cb3..0d0077548c 100644
--- a/src/widgets/kernel/qwidget_p.h
+++ b/src/widgets/kernel/qwidget_p.h
@@ -299,7 +299,7 @@ public:
 
     void setPalette_helper(const QPalette &);
     void resolvePalette();
-    QPalette naturalWidgetPalette(uint inheritedMask) const;
+    QPalette naturalWidgetPalette(QPalette::ResolveMask inheritedMask) const;
 
     void setMask_sys(const QRegion &);
 
@@ -672,7 +672,7 @@ public:
     // Other variables.
     uint directFontResolveMask;
     uint inheritedFontResolveMask;
-    uint inheritedPaletteResolveMask;
+    QPalette::ResolveMask inheritedPaletteResolveMask;
     short leftmargin;
     short topmargin;
     short rightmargin;