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

Conflicts:
	src/quick/items/qquickwindow.cpp
	src/quick/scenegraph/qsgrenderloop.cpp

Change-Id: Idd7106995b5545fcac869e9056a365ef9edb36ca

3 files changed, 8 insertions, 1 deletions

diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
index edee29584c..d016e79641 100644
--- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
@@ -2914,6 +2914,11 @@ void Renderer::renderRenderNode(Batch *batch)
         glBindFramebuffer(GL_FRAMEBUFFER, prevFbo);
 }
 
+void Renderer::releaseCachedResources()
+{
+    m_shaderManager->invalidated();
+}
+
 class VisualizeShader : public QOpenGLShaderProgram
 {
 public:
diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h b/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
index 2c0f8667e8..b0a14d23b9 100644
--- a/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
@@ -629,6 +629,7 @@ public:
 protected:
     void nodeChanged(QSGNode *node, QSGNode::DirtyState state) Q_DECL_OVERRIDE;
     void render() Q_DECL_OVERRIDE;
+    void releaseCachedResources() Q_DECL_OVERRIDE;
 
 private:
     enum ClipTypeBit
diff --git a/src/quick/scenegraph/coreapi/qsgrenderer_p.h b/src/quick/scenegraph/coreapi/qsgrenderer_p.h
index 1ea2775e6f..1cb4c56316 100644
--- a/src/quick/scenegraph/coreapi/qsgrenderer_p.h
+++ b/src/quick/scenegraph/coreapi/qsgrenderer_p.h
@@ -92,7 +92,8 @@ public:
     QSGNodeUpdater *nodeUpdater() const;
     void setNodeUpdater(QSGNodeUpdater *updater);
     inline QSGMaterialShader::RenderState state(QSGMaterialShader::RenderState::DirtyStates dirty) const;
-    virtual void setCustomRenderMode(const QByteArray &) { };
+    virtual void setCustomRenderMode(const QByteArray &) { }
+    virtual void releaseCachedResources() { }
 
     void clearChangedFlag() { m_changed_emitted = false; }