diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-07-15 08:50:37 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-07-15 09:58:23 +0200 |
| commit | 37c829f511d67be1c226201b4bbbe73c53835078 (patch) | |
| tree | 7b33de9b936068fa33cbe53147f3b5b36fd65554 /src/gui/kernel/qpalette.cpp | |
| parent | 2c81ba2df95cc07d5d147c8f3c7999c34848d274 (diff) | |
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>
Diffstat (limited to 'src/gui/kernel/qpalette.cpp')
| -rw-r--r-- | src/gui/kernel/qpalette.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |