Merge branch '5.8.0' into 5.8

Conflicts:
	src/render/backend/render-backend.pri
	src/render/backend/renderer_p.h
	src/render/frontend/qrenderaspect.cpp

Change-Id: If0481f031a6caf7995fefa93b96f1fdeb96cbd26

1 files changed, 15 insertions, 0 deletions

diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h
index 4ae2dc058..ed43fde13 100644
--- a/src/render/backend/managers_p.h
+++ b/src/render/backend/managers_p.h
@@ -218,6 +218,21 @@ class TextureManager : public Qt3DCore::QResourceManager<
 {
 public:
     TextureManager() {}
+
+    // Called in AspectThread by Texture node functor destroy
+    void addTextureIdToCleanup(Qt3DCore::QNodeId id)
+    {
+        m_textureIdsToCleanup.push_back(id);
+    }
+
+    // Called by RenderThread in updateGLResources (locked)
+    QVector<Qt3DCore::QNodeId> takeTexturesIdsToCleanup()
+    {
+        return std::move(m_textureIdsToCleanup);
+    }
+
+private:
+    QVector<Qt3DCore::QNodeId> m_textureIdsToCleanup;
 };
 
 class TransformManager : public Qt3DCore::QResourceManager<