From 37c829f511d67be1c226201b4bbbe73c53835078 Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Fri, 15 Jul 2022 08:50:37 +0200
Subject: QPalette: detach before modifying resolve mask when resolving

Amends 1d961491d817490da156769ddce6fce48a0bce4a. We modify the resolve
mask after making a shared copy of 'other', so we must detach. Call the
setter designed for that purpose.

Pick-to: 6.4 6.3 6.2
Task-number: QTBUG-98762
Change-Id: I4f45223e74764a341378992172787fae73efb8b7
Reviewed-by: JiDe Zhang <zhangjide@uniontech.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
---
 src/gui/kernel/qpalette.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/gui/kernel/qpalette.cpp')

diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp
index ea876d935e..2b6a7e643f 100644
--- a/src/gui/kernel/qpalette.cpp
+++ b/src/gui/kernel/qpalette.cpp
@@ -921,7 +921,7 @@ QPalette QPalette::resolve(const QPalette &other) const
     if ((*this == other && d->resolveMask == other.d->resolveMask)
         || d->resolveMask == 0) {
         QPalette o = other;
-        o.d->resolveMask = d->resolveMask;
+        o.setResolveMask(d->resolveMask);
         return o;
     }
 
-- 
cgit v1.2.3