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

Change-Id: Ib51c8311ce78b2fec62dd0c09cb943a85a7d0b2b

2 files changed, 2 insertions, 2 deletions

diff --git a/src/render/geometry/buffermanager.cpp b/src/render/geometry/buffermanager.cpp
index 25f95189e..14b552879 100644
--- a/src/render/geometry/buffermanager.cpp
+++ b/src/render/geometry/buffermanager.cpp
@@ -58,7 +58,7 @@ void BufferManager::addDirtyBuffer(Qt3DCore::QNodeId bufferId)
         m_dirtyBuffers.push_back(bufferId);
 }
 
-QVector<Qt3DCore::QNodeId> BufferManager::dirtyBuffers()
+QVector<Qt3DCore::QNodeId> BufferManager::takeDirtyBuffers()
 {
     return qMove(m_dirtyBuffers);
 }
diff --git a/src/render/geometry/buffermanager_p.h b/src/render/geometry/buffermanager_p.h
index ed3563876..4805955bd 100644
--- a/src/render/geometry/buffermanager_p.h
+++ b/src/render/geometry/buffermanager_p.h
@@ -72,7 +72,7 @@ public:
 
     // Aspect Thread
     void addDirtyBuffer(Qt3DCore::QNodeId bufferId);
-    QVector<Qt3DCore::QNodeId> dirtyBuffers();
+    QVector<Qt3DCore::QNodeId> takeDirtyBuffers();
 
     // Aspect Thread
     void addBufferReference(Qt3DCore::QNodeId bufferId);