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

Conflicts:
	.qmake.conf
	src/plugins/accessible/quick/quick.pro
	src/quick/items/qquickpincharea.cpp
	src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
	src/quick/scenegraph/qsgthreadedrenderloop.cpp

Manually adjusted for TestHTTPServer constructor change:
    tests/auto/quick/qquickimage/tst_qquickimage.cpp

Change-Id: I5e58a7c08ea92d6fc5e3bce98571c54f7b2ce08f

1 files changed, 31 insertions, 1 deletions

diff --git a/src/quick/items/qquickrendercontrol.cpp b/src/quick/items/qquickrendercontrol.cpp
index 4a199d9352..55736c33c3 100644
--- a/src/quick/items/qquickrendercontrol.cpp
+++ b/src/quick/items/qquickrendercontrol.cpp
@@ -220,7 +220,7 @@ QImage QQuickRenderControl::grab()
         return QImage();
 
     render();
-    QImage grabContent = qt_gl_read_framebuffer(d->window->size(), false, false);
+    QImage grabContent = qt_gl_read_framebuffer(d->window->size() * d->window->devicePixelRatio(), false, false);
     return grabContent;
 }
 
@@ -248,4 +248,34 @@ QQuickWindow *QQuickRenderControl::window() const
     return d->window;
 }
 
+/*!
+  \fn QWindow *QQuickRenderControl::renderWindow(QPoint *offset)
+
+  Reimplemented in subclasses to return the real window this render control
+  is rendering into.
+
+  If \a offset in non-null, it is set to the offset of the control
+  inside the window.
+*/
+
+/*!
+  Returns the real window that \a win is being rendered to, if any.
+
+  If \a offset in non-null, it is set to the offset of the rendering
+  inside its window.
+
+ */
+
+QWindow *QQuickRenderControl::renderWindowFor(QQuickWindow *win, QPoint *offset)
+{
+    if (!win)
+        return 0;
+    QQuickRenderControl *rc = QQuickWindowPrivate::get(win)->renderControl;
+    if (rc)
+        return rc->renderWindow(offset);
+    return 0;
+}
+
+
+
 QT_END_NAMESPACE