diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp
index ea876d935ee..2b6a7e643fa 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;
     }
 
diff --git a/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp b/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp
index cdb68175981..150d58e6f4f 100644
--- a/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp
+++ b/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp
@@ -102,9 +102,16 @@ void tst_QPalette::resolve()
     // ensure the resolve mask is full
     for (int r = 0; r < QPalette::NColorRoles; ++r)
         p3.setBrush(QPalette::All, QPalette::ColorRole(r), Qt::red);
+    const QPalette::ResolveMask fullMask = p3.resolveMask();
 
     QPalette p3ResolvedToP1 = p3.resolve(p1);
     QVERIFY(p3ResolvedToP1.isCopyOf(p3));
+
+    QPalette p4;
+    QCOMPARE(p4.resolveMask(), QPalette::ResolveMask{});
+    // resolve must detach even if p4 has no mask
+    p4 = p4.resolve(p3);
+    QCOMPARE(p3.resolveMask(), fullMask);
 }