diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-02-27 21:26:18 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-02-28 13:34:44 +0100 |
| commit | 6b8a6b9fc86e94c1160d640a2b9718a7ae275b08 (patch) | |
| tree | bd00b667ba6f8e11a40e3f3dcc73a5ce51ff39c8 /src/quick/items/qquickpaletteproviderprivatebase_p.h | |
| parent | d0db469788039cf73406ba3f489b7a00b0601f01 (diff) | |
QQuickPaletteProviderPrivateBase: use palette getter
Otherwise, we can get a crash in QQuickPopupItemPrivate, which does not
have a palette when using the Fusion style (so m_palette is nullptr),
but instead hands us its popup's palette.
Pick-to: 6.0 6.1
Change-Id: Ib472139735dc3a7892771c6097267c0ec6902a99
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/quick/items/qquickpaletteproviderprivatebase_p.h')
| -rw-r--r-- | src/quick/items/qquickpaletteproviderprivatebase_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickpaletteproviderprivatebase_p.h b/src/quick/items/qquickpaletteproviderprivatebase_p.h index a600a23ce6..b1b5958329 100644 --- a/src/quick/items/qquickpaletteproviderprivatebase_p.h +++ b/src/quick/items/qquickpaletteproviderprivatebase_p.h @@ -323,7 +323,7 @@ void QQuickPaletteProviderPrivateBase<I, Impl>::inheritPalette(const QPalette &p if (providesPalette()) { // If palette is changed, then this function will be invoked // for all children because of connection with signal changed() - m_palette->inheritPalette(parentPalette); + palette()->inheritPalette(parentPalette); } else { // Otherwise, just propagate parent palette to all children updateChildrenPalettes(parentPalette); |