Use QPalette::resolveMask() and setResolveMask() where necessary

This is needed after qtbase b77a3f47c9d6f4fd68a687e3bdb38e550d2810ad.

Change-Id: I41cf66d51dad7209c21d9e4049497a1f911e132a
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/quick/items/qquickpalettecolorprovider.cpp b/src/quick/items/qquickpalettecolorprovider.cpp
index 6808e8843a..2eef1dce63 100644
--- a/src/quick/items/qquickpalettecolorprovider.cpp
+++ b/src/quick/items/qquickpalettecolorprovider.cpp
@@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE
 
 static bool notEq(const QPalette &p1, const QPalette &p2)
 {
-    return p1.resolve() != p2.resolve() || p1 != p2;
+    return p1.resolveMask() != p2.resolveMask() || p1 != p2;
 }
 
 static QPalette::ColorGroup adjustCg(QPalette::ColorGroup group)
@@ -134,7 +134,7 @@ bool QQuickPaletteColorProvider::reset()
 bool QQuickPaletteColorProvider::inheritPalette(const QPalette &p)
 {
     QPalette parentPalette = m_requestedPalette.isAllocated() ? m_requestedPalette->resolve(p) : p;
-    parentPalette.resolve(m_requestedPalette.isAllocated() ? m_requestedPalette->resolve() | p.resolve() : p.resolve());
+    parentPalette.setResolveMask(m_requestedPalette.isAllocated() ? m_requestedPalette->resolveMask() | p.resolveMask() : p.resolveMask());
 
     auto tmpResolvedPalette = parentPalette.resolve(paletteProvider()->defaultPalette());