Merge "Merge remote-tracking branch 'origin/5.15' into dev"

4 files changed, 31 insertions, 1 deletions

diff --git a/dist/changes-5.15.0 b/dist/changes-5.15.0
new file mode 100644
index 000000000..d2225b2b5
--- /dev/null
+++ b/dist/changes-5.15.0
@@ -0,0 +1,24 @@
+Qt 5.15 introduces many new features and improvements as well as bugfixes
+over the 5.14.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.15 series is binary compatible with the 5.14.x series.
+Applications compiled for 5.14 will continue to run with 5.15.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                               UNSPECIFIED                                *
+****************************************************************************
+
+ -  QSortPolicy add Uniform mode (to control whether uniform minization
+   should be performed)
+ -  QMouseDevice add updateAxesContinuously property
diff --git a/src/quick3d/imports/scene3d/scene3drenderer.cpp b/src/quick3d/imports/scene3d/scene3drenderer.cpp
index e75dd9689..34207a431 100644
--- a/src/quick3d/imports/scene3d/scene3drenderer.cpp
+++ b/src/quick3d/imports/scene3d/scene3drenderer.cpp
@@ -160,13 +160,13 @@ Scene3DRenderer::Scene3DRenderer()
     , m_allowRendering(0)
     , m_compositingMode(Scene3DItem::FBO)
 {
+
 }
 
 void Scene3DRenderer::init(Scene3DItem *item, Qt3DCore::QAspectEngine *aspectEngine,
                            QRenderAspect *renderAspect)
 {
     m_item = item;
-    m_window = m_item->window();
     m_aspectEngine = aspectEngine;
     m_renderAspect = renderAspect;
     m_needsShutdown = true;
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp
index 3c5c2c053..170fc6339 100644
--- a/src/render/frontend/qrenderaspect.cpp
+++ b/src/render/frontend/qrenderaspect.cpp
@@ -840,6 +840,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;
 
diff --git a/src/render/surfaces/vulkaninstance_p.h b/src/render/surfaces/vulkaninstance_p.h
index 14e6e8718..67f52af6a 100644
--- a/src/render/surfaces/vulkaninstance_p.h
+++ b/src/render/surfaces/vulkaninstance_p.h
@@ -53,7 +53,9 @@
 
 #include <QtGui/qtguiglobal.h>
 #include <Qt3DRender/private/qt3drender_global_p.h>
+
 QT_BEGIN_NAMESPACE
+
 #if QT_CONFIG(vulkan)
 class QVulkanInstance;
 namespace Qt3DRender {
@@ -61,6 +63,7 @@ Q_3DRENDERSHARED_PRIVATE_EXPORT
 QVulkanInstance& staticVulkanInstance() noexcept;
 } // Qt3DRender
 #endif
+
 QT_END_NAMESPACE
 
 #endif // QT3DRENDER_VULKANINSTANCE_P_H