1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QPalette: clarify documentation of resolve a bit

Browse Source 
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>
This commit is contained in:
Volker Hilsheimer 2024-05-23 10:04:30 +02:00 committed by Qt Cherry-pick Bot
parent 074c812cb0
commit 80b41c615d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/kernel/qpalette.cpp
View File

@ -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
{