summaryrefslogtreecommitdiffstats
path: root/src/render/frontend
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-05-14 21:09:30 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-05-14 21:09:31 +0200
commit8f1f3e71195faa369d70d75c7442f55979d2e855 (patch)
tree14a4d2d959f103227ec545530fc4699465fc72c6 /src/render/frontend
parentad238237b73a70867554d84b3c1762da637c210d (diff)
parent1f1f4b779382289abba98c5914ff18f593124bac (diff)
Merge remote-tracking branch 'origin/5.15' into dev
Diffstat (limited to 'src/render/frontend')
-rw-r--r--src/render/frontend/qrenderaspect.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp
index 015f5bba2..52a15c7bb 100644
--- a/src/render/frontend/qrenderaspect.cpp
+++ b/src/render/frontend/qrenderaspect.cpp
@@ -847,6 +847,9 @@ void QRenderAspect::onUnregistered()
d->m_renderer->releaseGraphicsResources();
+ if (d->m_aspectManager)
+ d->services()->eventFilterService()->unregisterEventFilter(d->m_pickEventFilter.data());
+
delete d->m_nodeManagers;
d->m_nodeManagers = nullptr;