Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into tqtc/lts-5.15-opensourcev5.15.6-lts-lgpl

Change-Id: I85122ded86860165f2d9523e3ac15e129df1fa75

1 files changed, 4 insertions, 1 deletions

diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp
index 903de676..bb1b9b15 100644
--- a/src/quicktemplates2/qquickapplicationwindow.cpp
+++ b/src/quicktemplates2/qquickapplicationwindow.cpp
@@ -48,6 +48,7 @@
 #include "qquickdeferredpointer_p_p.h"
 
 #include <QtCore/private/qobject_p.h>
+#include <QtCore/qscopedvaluerollback.h>
 #include <QtQuick/private/qquickitem_p.h>
 #include <QtQuick/private/qquickitemchangelistener_p.h>
 
@@ -174,6 +175,7 @@ public:
     QPalette palette;
     QQuickItem *activeFocusControl = nullptr;
     QQuickApplicationWindow *q_ptr = nullptr;
+    bool insideRelayout = false;
 };
 
 static void layoutItem(QQuickItem *item, qreal y, qreal width)
@@ -192,9 +194,10 @@ static void layoutItem(QQuickItem *item, qreal y, qreal width)
 void QQuickApplicationWindowPrivate::relayout()
 {
     Q_Q(QQuickApplicationWindow);
-    if (!complete)
+    if (!complete || insideRelayout)
         return;
 
+    QScopedValueRollback<bool> guard(insideRelayout, true);
     QQuickItem *content = q->contentItem();
     qreal hh = header && header->isVisible() ? header->height() : 0;
     qreal fh = footer && footer->isVisible() ? footer->height() : 0;