diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2021-06-15 13:48:15 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-16 09:59:50 +0000 |
commit | 81c37aa5f4178c60abe64f204e5b7879ff9e2e0c (patch) | |
tree | 844c2ba799468c964a929270e89786b63a00d213 | |
parent | 9569779c37c2d98f8550a917b7274baffd4ae6c0 (diff) |
QQuickPaletteProviderPrivateBase: Do not use paletteData() directly
Subclasses may override palette() and paletteData() may not be the
actual source of the palette data. QQuickPopupItemPrivate in
qtquickcontrols2 does this.
Fixes: QTBUG-94533
Change-Id: I0434aafab8d0e9fc97f06c04c8dfaef738f4bf09
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 386a5b85b7fa201e26e8795373d77457728c806a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/quick/items/qquickpaletteproviderprivatebase_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/items/qquickpaletteproviderprivatebase_p.h b/src/quick/items/qquickpaletteproviderprivatebase_p.h index 9399462130..0219724e56 100644 --- a/src/quick/items/qquickpaletteproviderprivatebase_p.h +++ b/src/quick/items/qquickpaletteproviderprivatebase_p.h @@ -336,12 +336,12 @@ template<class I, class Impl> void QQuickPaletteProviderPrivateBase<I, Impl>::setCurrentColorGroup() { if constexpr (!isRootWindow<I>()) { - if (paletteData()) { + if (providesPalette()) { const bool enabled = itemWithPalette()->isEnabled(); const auto window = itemWithPalette()->window(); const bool active = window ? window->isActive() : true; - paletteData()->setCurrentGroup(enabled ? (active ? QPalette::Active : QPalette::Inactive) - : QPalette::Disabled); + palette()->setCurrentGroup(enabled ? (active ? QPalette::Active : QPalette::Inactive) + : QPalette::Disabled); } } } |