From 80b41c615dd78120784859ed67e9743cc2ff6c64 Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Thu, 23 May 2024 10:04:30 +0200
Subject: [PATCH] QPalette: clarify documentation of resolve a bit

Explain where the colors come from for unset roles, and add a see-also
for isBrushSet.

Pick-to: 6.5
Change-Id: I35e58e6b0f3ff9e57d9df95879859dd10424dc92
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit f9cf13d23e8777aa88e8dd9bb631afed5f4f9acc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/gui/kernel/qpalette.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp
index 256ea52f012..e308b796ab4 100644
--- a/src/gui/kernel/qpalette.cpp
+++ b/src/gui/kernel/qpalette.cpp
@@ -958,7 +958,10 @@ static constexpr QPalette::ResolveMask allResolveMask()
 
 /*!
     Returns a new QPalette that is a union of this instance and \a other.
-    Color roles set in this instance take precedence.
+    Color roles set in this instance take precedence. Roles that are not
+    set in this instance will be taken from \a other.
+
+    \sa isBrushSet
 */
 QPalette QPalette::resolve(const QPalette &other) const
 {