Merge remote-tracking branch 'origin/tqtc/lts-5.15.10' into tqtc/lts-5.15-opensourcev5.15.10-lts-lgpl

Change-Id: I4bb6db168d46ee76a1bbe0078f6d943c666ca689

5 files changed, 10 insertions, 2 deletions

diff --git a/.qmake.conf b/.qmake.conf
index bf083d62..92c6c65f 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -3,4 +3,4 @@ load(qt_build_config)
 CONFIG += warning_clean
 DEFINES += QT_NO_FOREACH
 
-MODULE_VERSION = 5.15.9
+MODULE_VERSION = 5.15.10
diff --git a/src/quick3d/qquick3dnode.cpp b/src/quick3d/qquick3dnode.cpp
index 08e609b9..8f5a4b83 100644
--- a/src/quick3d/qquick3dnode.cpp
+++ b/src/quick3d/qquick3dnode.cpp
@@ -324,7 +324,7 @@ QVector3D QQuick3DNode::scenePosition() const
 }
 
 /*!
-    \qmlproperty vector3d QtQuick3D::Node::sceneRotation
+    \qmlproperty quaternion QtQuick3D::Node::sceneRotation
 
     This property returns the rotation of the node in scene space.
 */
diff --git a/src/quick3d/qquick3dscenerenderer.cpp b/src/quick3d/qquick3dscenerenderer.cpp
index a4d0ea1e..d8a732d1 100644
--- a/src/quick3d/qquick3dscenerenderer.cpp
+++ b/src/quick3d/qquick3dscenerenderer.cpp
@@ -540,6 +540,7 @@ void QQuick3DSceneRenderer::addNodeToLayer(QSSGRenderNode *node)
 void QQuick3DSceneRenderer::deleteResources()
 {
     m_sceneManager->updateDirtyNodes();
+    m_sgContext->deleteLayerResources(*m_layer);
     delete m_layer;
     delete m_fbo;
     delete m_antialiasingFbo;
diff --git a/src/runtimerender/qssgrendercontextcore.cpp b/src/runtimerender/qssgrendercontextcore.cpp
index c4c01d83..37a48781 100644
--- a/src/runtimerender/qssgrendercontextcore.cpp
+++ b/src/runtimerender/qssgrendercontextcore.cpp
@@ -265,5 +265,10 @@ void QSSGRenderContextInterface::endFrame()
     ++m_frameCount;
 }
 
+void QSSGRenderContextInterface::deleteLayerResources(QSSGRenderLayer &inLayer)
+{
+    renderer()->releaseLayerRenderResources(inLayer);
+}
+
 QT_END_NAMESPACE
 
diff --git a/src/runtimerender/qssgrendercontextcore_p.h b/src/runtimerender/qssgrendercontextcore_p.h
index 0e71082e..7b2490e5 100644
--- a/src/runtimerender/qssgrendercontextcore_p.h
+++ b/src/runtimerender/qssgrendercontextcore_p.h
@@ -195,6 +195,8 @@ public:
     // of everything.
     // Next call end frame.
     void endFrame();
+
+    void deleteLayerResources(QSSGRenderLayer &inLayer);
 };
 QT_END_NAMESPACE