Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: Id9840c5e90c01139de1a547b6e271a19791a8a59

1 files changed, 15 insertions, 0 deletions

diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h
index a8e736513..c4d873ddc 100644
--- a/src/render/backend/managers_p.h
+++ b/src/render/backend/managers_p.h
@@ -230,12 +230,27 @@ public:
         m_textureIdsToCleanup.push_back(id);
     }
 
+    // Called in AspectThread by Texture node functor create
+    void removeTextureIdToCleanup(Qt3DCore::QNodeId id)
+    {
+        m_textureIdsToCleanup.removeAll(id);
+    }
+
     // Called by RenderThread in updateGLResources (locked)
     QVector<Qt3DCore::QNodeId> takeTexturesIdsToCleanup()
     {
         return std::move(m_textureIdsToCleanup);
     }
 
+#ifdef QT_BUILD_INTERNAL
+    // For unit testing purposes only
+    QVector<Qt3DCore::QNodeId> textureIdsToCleanup() const
+    {
+        return m_textureIdsToCleanup;
+    }
+
+#endif
+
 private:
     QVector<Qt3DCore::QNodeId> m_textureIdsToCleanup;
 };