Merge remote-tracking branch 'origin/5.3' into 5.4

Conflicts:
	src/qml/jsruntime/qv4include.cpp
	src/quick/items/qquickrendercontrol.cpp
	src/quick/items/qquickrendercontrol_p.h
	src/quickwidgets/qquickwidget.cpp

Change-Id: Ib2dc0051a38cd283a37a7665eb4a76f6f7ec8b15

1 files changed, 6 insertions, 5 deletions

diff --git a/src/quick/items/qquickframebufferobject.cpp b/src/quick/items/qquickframebufferobject.cpp
index 0a8ad36476..fea6aadc23 100644
--- a/src/quick/items/qquickframebufferobject.cpp
+++ b/src/quick/items/qquickframebufferobject.cpp
@@ -235,8 +235,12 @@ QSGNode *QQuickFramebufferObject::updatePaintNode(QSGNode *node, UpdatePaintNode
 
     n->renderer->synchronize(this);
 
+    QSize minFboSize = d->sceneGraphContext()->minimumFBOSize();
+    QSize desiredFboSize(qMax<int>(minFboSize.width(), width()),
+                         qMax<int>(minFboSize.height(), height()));
+
     if (n->fbo && (d->followsItemSize || n->invalidatePending)) {
-        if (n->fbo->width() != width() || n->fbo->height() != height()) {
+        if (n->fbo->size() != desiredFboSize) {
             delete n->fbo;
             n->fbo = 0;
             delete n->msDisplayFbo;
@@ -245,10 +249,7 @@ QSGNode *QQuickFramebufferObject::updatePaintNode(QSGNode *node, UpdatePaintNode
     }
 
     if (!n->fbo) {
-        QSize minFboSize = d->sceneGraphContext()->minimumFBOSize();
-        QSize fboSize(qMax<int>(minFboSize.width(), width()),
-                      qMax<int>(minFboSize.height(), height()));
-        n->fbo = n->renderer->createFramebufferObject(fboSize);
+        n->fbo = n->renderer->createFramebufferObject(desiredFboSize);
 
         GLuint displayTexture = n->fbo->texture();