Merge remote-tracking branch 'origin/5.11' into 5.12.0v5.12.0-beta4

Change-Id: I5499524c9f4553342d192d554d4455fd7933eaa9

1 files changed, 3 insertions, 0 deletions

diff --git a/src/render/renderers/opengl/renderer/renderer.cpp b/src/render/renderers/opengl/renderer/renderer.cpp
index 5d12729f2..8b98c658c 100644
--- a/src/render/renderers/opengl/renderer/renderer.cpp
+++ b/src/render/renderers/opengl/renderer/renderer.cpp
@@ -106,6 +106,7 @@
 #include <QSurface>
 #include <QElapsedTimer>
 #include <QLibraryInfo>
+#include <QMutexLocker>
 #include <QPluginLoader>
 #include <QDir>
 #include <QUrl>
@@ -442,8 +443,10 @@ void Renderer::shutdown()
 
     // We delete any renderqueue that we may not have had time to render
     // before the surface was destroyed
+    QMutexLocker lockRenderQueue(m_renderQueue->mutex());
     qDeleteAll(m_renderQueue->nextFrameQueue());
     m_renderQueue->reset();
+    lockRenderQueue.unlock();
 
     m_commandThread->shutdown();