Merge remote-tracking branch 'origin/tqtc/lts-5.15.12' into tqtc/lts-5.15-opensourcev5.15.12-lts-lgpl

Change-Id: I6a330e383bb573bd7ba6cfea7e8bce3e88de2d7a

1 files changed, 4 insertions, 5 deletions

diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
index ca3a4b2ea..a948a5218 100644
--- a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
+++ b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
@@ -374,6 +374,8 @@ void QDeclarativeVideoOutput::_q_updateNativeSize()
     if (!m_backend)
         return;
 
+    m_geometryDirty = true;
+
     QSize size = m_backend->nativeSize();
     if (!qIsDefaultAspect(m_orientation)) {
         size.transpose();
@@ -382,8 +384,6 @@ void QDeclarativeVideoOutput::_q_updateNativeSize()
     if (m_nativeSize != size) {
         m_nativeSize = size;
 
-        m_geometryDirty = true;
-
         setImplicitWidth(size.width());
         setImplicitHeight(size.height());
 
@@ -421,9 +421,8 @@ void QDeclarativeVideoOutput::_q_updateGeometry()
     }
 
     if (m_backend) {
-        if (!m_backend->videoSurface() || m_backend->videoSurface()->isActive())
-            m_backend->updateGeometry();
-        else
+        m_backend->updateGeometry();
+        if (m_backend->videoSurface() && !m_backend->videoSurface()->isActive())
             m_geometryDirty = true;
     }