Merge branch 'jb35332' into 'mer-stable'

[qtdeclarative] Fix race condition in threaded renderloop. Contributes to JB#35332.



See merge request !6

src/quick/scenegraph/qsgthreadedrenderloop.cpp

@@ -154,7 +154,7 @@ const QEvent::Type WM_TryRelease        = QEvent::Type(QEvent::User + 4);
 // called.
 const QEvent::Type WM_Grab              = QEvent::Type(QEvent::User + 5);
 
-template <typename T> T *windowFor(const QList<T> list, QQuickWindow *window)
+template <typename T> T *windowFor(const QList<T> &list, QQuickWindow *window)
 {
     for (int i=0; i<list.size(); ++i) {
         const T &t = list.at(i);
@@ -953,9 +953,9 @@ void QSGThreadedRenderLoop::handleObscurity(Window *w)
 void QSGThreadedRenderLoop::handleUpdateRequest(QQuickWindow *window)
 {
     qCDebug(QSG_LOG_RENDERLOOP) << "- polish and sync update request";
-    foreach (const Window &w, m_windows)
-        if (w.window == window)
-            polishAndSync(const_cast<Window *>(&w));
+    Window *w = windowFor(m_windows, window);
+    if (w)
+        polishAndSync(w);
 }
 
 void QSGThreadedRenderLoop::maybeUpdate(QQuickWindow *window)