diff options
| author | Vitaly Fanaskov <vitaly.fanaskov@qt.io> | 2019-11-22 14:26:12 +0100 |
|---|---|---|
| committer | Vitaly Fanaskov <vitaly.fanaskov@qt.io> | 2020-01-02 15:46:38 +0100 |
| commit | 045250ed4258932d7fbc13cdad163db1cd64dca7 (patch) | |
| tree | c80899d987e6133ffe84405472ad43076774b12d /src/widgets/styles/qstylesheetstyle_p.h | |
| parent | deddafe0a6a32aa438cc36c7dcfae8c323274487 (diff) | |
Fix QPalette::isBrushSet
The previous implementation did not take into account different color
groups in resolve mask. It led to some issues when resolving a
palette or checking whether a brush is set or not.
Task-number: QTBUG-78544
Change-Id: I9b67b2c444eb62c022643022a874dc400005e6ee
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/widgets/styles/qstylesheetstyle_p.h')
| -rw-r--r-- | src/widgets/styles/qstylesheetstyle_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/styles/qstylesheetstyle_p.h b/src/widgets/styles/qstylesheetstyle_p.h index c5266558af..81c532bf6a 100644 --- a/src/widgets/styles/qstylesheetstyle_p.h +++ b/src/widgets/styles/qstylesheetstyle_p.h @@ -194,7 +194,7 @@ public: template <typename T> struct Tampered { T oldWidgetValue; - uint resolveMask; + decltype(std::declval<T>().resolve()) resolveMask; // only call this function on an rvalue *this (it mangles oldWidgetValue) T reverted(T current) |