Merge remote-tracking branch 'origin/5.9' into 5.10

 Conflicts:
	.qmake.conf

Change-Id: I3d6e69f3f99b2f0a0e2c29ffdd02176e1f22304e

1 files changed, 2 insertions, 2 deletions

diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp b/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp
index f1b7662b5..0cb6659ca 100644
--- a/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp
+++ b/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp
@@ -382,9 +382,9 @@ QAbstractVideoSurface *QDeclarativeVideoRendererBackend::videoSurface() const
 QRectF QDeclarativeVideoRendererBackend::adjustedViewport() const
 {
     const QRectF viewport = m_surface->surfaceFormat().viewport();
-    const QSize pixelAspectRatio = m_surface->surfaceFormat().pixelAspectRatio();
+    const QSizeF pixelAspectRatio = m_surface->surfaceFormat().pixelAspectRatio();
 
-    if (pixelAspectRatio.height() != 0) {
+    if (pixelAspectRatio.isValid()) {
         const qreal ratio = pixelAspectRatio.width() / pixelAspectRatio.height();
         QRectF result = viewport;
         result.setX(result.x() * ratio);