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

Conflicts:
	src/widgets/styles/qstyleanimation.cpp

Change-Id: Iae570895be6544de80f9c1ec309d1a08c59daff8

1 files changed, 18 insertions, 7 deletions

diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp
index f16f29718d..96b09342c7 100644
--- a/src/gui/kernel/qopenglcontext.cpp
+++ b/src/gui/kernel/qopenglcontext.cpp
@@ -759,15 +759,26 @@ void QOpenGLContextGroupPrivate::removeContext(QOpenGLContext *ctx)
 {
     Q_Q(QOpenGLContextGroup);
 
-    QMutexLocker locker(&m_mutex);
-    m_shares.removeOne(ctx);
+    bool deleteObject = false;
+
+    {
+        QMutexLocker locker(&m_mutex);
+        m_shares.removeOne(ctx);
 
-    if (ctx == m_context && !m_shares.isEmpty())
-        m_context = m_shares.first();
+        if (ctx == m_context && !m_shares.isEmpty())
+            m_context = m_shares.first();
+
+        if (!m_refs.deref()) {
+            cleanup();
+            deleteObject = true;
+        }
+    }
 
-    if (!m_refs.deref()) {
-        cleanup();
-        q->deleteLater();
+    if (deleteObject) {
+        if (q->thread() == QThread::currentThread())
+            delete q; // Delete directly to prevent leak, refer to QTBUG-29056
+        else
+            q->deleteLater();
     }
 }