Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev

1 files changed, 21 insertions, 6 deletions

diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 8bd6adca94..c0d2dc3f33 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -366,7 +366,7 @@ void QQuickWindowPrivate::renderSceneGraph(const QSize &size)
     runAndClearJobs(&beforeRenderingJobs);
     if (!customRenderStage || !customRenderStage->render()) {
         int fboId = 0;
-        const qreal devicePixelRatio = q->devicePixelRatio();
+        const qreal devicePixelRatio = q->effectiveDevicePixelRatio();
         renderer->setDeviceRect(QRect(QPoint(0, 0), size * devicePixelRatio));
         if (renderTargetId) {
             fboId = renderTargetId;
@@ -375,11 +375,10 @@ void QQuickWindowPrivate::renderSceneGraph(const QSize &size)
             renderer->setViewportRect(QRect(QPoint(0, 0), size * devicePixelRatio));
         }
         renderer->setProjectionMatrixToRect(QRect(QPoint(0, 0), size));
-        renderer->setDevicePixelRatio(q->devicePixelRatio());
+        renderer->setDevicePixelRatio(devicePixelRatio);
 
         context->renderNextFrame(renderer, fboId);
     }
-
     emit q->afterRendering();
     runAndClearJobs(&afterRenderingJobs);
 }
@@ -463,8 +462,7 @@ void QQuickWindowPrivate::init(QQuickWindow *c, QQuickRenderControl *control)
     q->setSurfaceType(windowManager ? windowManager->windowSurfaceType() : QSurface::OpenGLSurface);
     q->setFormat(sg->defaultSurfaceFormat());
 
-    animationController = new QQuickAnimatorController();
-    animationController->m_window = q;
+    animationController = new QQuickAnimatorController(q);
 
     delayedTouch = 0;
 
@@ -3257,7 +3255,7 @@ QImage QQuickWindow::grabWindow()
         d->syncSceneGraph();
         d->renderSceneGraph(size());
 
-        QImage image = qt_gl_read_framebuffer(size() * devicePixelRatio(), false, false);
+        QImage image = qt_gl_read_framebuffer(size() * effectiveDevicePixelRatio(), false, false);
         d->cleanupNodesOnShutdown();
         d->context->invalidate();
         context.doneCurrent();
@@ -4020,6 +4018,23 @@ void QQuickWindow::runJobsAfterSwap()
     d->runAndClearJobs(&d->afterSwapJobs);
 }
 
+/*!
+ * Returns the device pixel ratio for this window.
+ *
+ * This is different from QWindow::devicePixelRatio() in that it supports
+ * redirected rendering via QQuickRenderControl. When using a
+ * QQuickRenderControl, the QQuickWindow is often not created, meaning it is
+ * never shown and there is no underlying native window created in the
+ * windowing system. As a result, querying properties like the device pixel
+ * ratio cannot give correct results. Use this function instead.
+ *
+ * \sa QWindow::devicePixelRatio()
+ */
+int QQuickWindow::effectiveDevicePixelRatio() const
+{
+    QWindow *w = QQuickRenderControl::renderWindowFor(const_cast<QQuickWindow *>(this));
+    return w ? w->devicePixelRatio() : devicePixelRatio();
+}
 
 #include "moc_qquickwindow.cpp"