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

Conflicts:
	src/qml/jsruntime/qv4variantobject.cpp
	src/qml/types/qquickworkerscript.cpp
	src/quick/scenegraph/util/qsgdefaultpainternode_p.h
	tools/qmljs/qmljs.cpp

Change-Id: I876242714ec8c046238d8fd673a5ace2455b2b59

2 files changed, 15 insertions, 3 deletions

diff --git a/src/quick/scenegraph/util/qsgdefaultpainternode.cpp b/src/quick/scenegraph/util/qsgdefaultpainternode.cpp
index e1aea290a3..389b9e0b4e 100644
--- a/src/quick/scenegraph/util/qsgdefaultpainternode.cpp
+++ b/src/quick/scenegraph/util/qsgdefaultpainternode.cpp
@@ -443,9 +443,21 @@ void QSGDefaultPainterNode::setContentsScale(qreal s)
     markDirty(DirtyMaterial);
 }
 
-void QSGDefaultPainterNode::setFastFBOResizing(bool dynamic)
+void QSGDefaultPainterNode::setFastFBOResizing(bool fastResizing)
 {
-    m_fastFBOResizing = dynamic;
+    if (m_fastFBOResizing == fastResizing)
+        return;
+
+    m_fastFBOResizing = fastResizing;
+    updateFBOSize();
+
+    if ((m_preferredRenderTarget == QQuickPaintedItem::FramebufferObject
+         || m_preferredRenderTarget == QQuickPaintedItem::InvertedYFramebufferObject)
+            && (!m_fbo || (m_fbo && m_fbo->size() != m_fboSize))) {
+        m_dirtyRenderTarget = true;
+        m_dirtyGeometry = true;
+        m_dirtyTexture = true;
+    }
 }
 
 QImage QSGDefaultPainterNode::toImage() const
diff --git a/src/quick/scenegraph/util/qsgdefaultpainternode_p.h b/src/quick/scenegraph/util/qsgdefaultpainternode_p.h
index a433b3292a..084fc1e004 100644
--- a/src/quick/scenegraph/util/qsgdefaultpainternode_p.h
+++ b/src/quick/scenegraph/util/qsgdefaultpainternode_p.h
@@ -109,7 +109,7 @@ public:
     void setContentsScale(qreal s) override;
     qreal contentsScale() const { return m_contentsScale; }
 
-    void setFastFBOResizing(bool dynamic) override;
+    void setFastFBOResizing(bool fastResizing) override;
     bool fastFBOResizing() const { return m_fastFBOResizing; }
 
     void setTextureSize(const QSize &textureSize) override;