diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2020-10-14 11:06:01 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2020-10-15 11:12:49 +0200 |
| commit | 266cd7638d887b31d56964a0f13fe208821703b1 (patch) | |
| tree | 8d88f95fdc1a70ac6b899af012c617ea83dd1df8 /tests/auto/quick/qquickshadereffect/CMakeLists.txt | |
| parent | 678d4ec4b68d43d0c748a8ec62a13716f83a27cf (diff) | |
QQuickShaderEffect: fix crash when hiding parent
It's possible for itemChange to be called during destruction when
deleting the QQuickShaderEffectImpl. We nullify m_impl before deleting
it via another pointer to it, so we must check that it's not null
before trying to use it.
Pick-to: 5.15
Fixes: QTBUG-86402
Change-Id: If4955445f7cc0d1f376bc9b86b95e1cca4d88ede
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'tests/auto/quick/qquickshadereffect/CMakeLists.txt')
| -rw-r--r-- | tests/auto/quick/qquickshadereffect/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickshadereffect/CMakeLists.txt b/tests/auto/quick/qquickshadereffect/CMakeLists.txt index 92a1baa227..6eebadeedf 100644 --- a/tests/auto/quick/qquickshadereffect/CMakeLists.txt +++ b/tests/auto/quick/qquickshadereffect/CMakeLists.txt @@ -27,6 +27,8 @@ set(resources_resource_files "data/connections.qml" "data/deleteShaderEffectSource.qml" "data/deleteSourceItem.qml" + "data/hideParent.qml" + "data/opacity-mask.frag.qsb" "data/red.frag" "data/star.png" "data/test.frag" |