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

Conflicts:
	src/qml/qml/qqmltypeloader.cpp

Change-Id: I07647700fc86764c95a5ef95c568e700a70fe45f

1 files changed, 2 insertions, 2 deletions

diff --git a/src/quick/scenegraph/util/qsgdefaultpainternode.cpp b/src/quick/scenegraph/util/qsgdefaultpainternode.cpp
index 561eccdb0c..e1aea290a3 100644
--- a/src/quick/scenegraph/util/qsgdefaultpainternode.cpp
+++ b/src/quick/scenegraph/util/qsgdefaultpainternode.cpp
@@ -225,7 +225,7 @@ void QSGDefaultPainterNode::updateGeometry()
     if (m_actualRenderTarget == QQuickPaintedItem::Image)
         source = QRectF(0, 0, 1, 1);
     else
-        source = QRectF(0, 0, qreal(m_size.width()) / m_fboSize.width(), qreal(m_size.height()) / m_fboSize.height());
+        source = QRectF(0, 0, qreal(m_textureSize.width()) / m_fboSize.width(), qreal(m_textureSize.height()) / m_fboSize.height());
     QRectF dest(0, 0, m_size.width(), m_size.height());
     if (m_actualRenderTarget == QQuickPaintedItem::InvertedYFramebufferObject)
         dest = QRectF(QPointF(0, m_size.height()), QPointF(m_size.width(), 0));
@@ -307,7 +307,7 @@ void QSGDefaultPainterNode::updateRenderTarget()
     QSGPainterTexture *texture = new QSGPainterTexture;
     if (m_actualRenderTarget == QQuickPaintedItem::Image) {
         texture->setOwnsTexture(true);
-        texture->setTextureSize(m_size);
+        texture->setTextureSize(m_textureSize);
     } else {
         texture->setTextureId(m_fbo->texture());
         texture->setOwnsTexture(false);