Merge remote-tracking branch 'origin/5.14' into 5.15

 Conflicts:
	src/qml/jsruntime/qv4engine.cpp

Change-Id: I61f41672e2dfe7e542ca30fed5f173d0a9ee3412

4 files changed, 34 insertions, 5 deletions

diff --git a/src/imports/layouts/qquicklayout.cpp b/src/imports/layouts/qquicklayout.cpp
index 1ca4056ba9..33c27bd928 100644
--- a/src/imports/layouts/qquicklayout.cpp
+++ b/src/imports/layouts/qquicklayout.cpp
@@ -700,8 +700,10 @@ QQuickItem *QQuickLayoutAttached::item() const
 
 
 QQuickLayout::QQuickLayout(QQuickLayoutPrivate &dd, QQuickItem *parent)
-    : QQuickItem(dd, parent),
-      m_dirty(false)
+    : QQuickItem(dd, parent)
+    , m_dirty(false)
+    , m_inUpdatePolish(false)
+    , m_polishInsideUpdatePolish(0)
 {
 }
 
@@ -728,7 +730,9 @@ QQuickLayoutAttached *QQuickLayout::qmlAttachedProperties(QObject *object)
 
 void QQuickLayout::updatePolish()
 {
+    m_inUpdatePolish = true;
     rearrange(QSizeF(width(), height()));
+    m_inUpdatePolish = false;
 }
 
 void QQuickLayout::componentComplete()
@@ -749,7 +753,18 @@ void QQuickLayout::invalidate(QQuickItem * /*childItem*/)
 
     if (!qobject_cast<QQuickLayout *>(parentItem())) {
         quickLayoutDebug() << "QQuickLayout::invalidate(), polish()";
-        polish();
+
+        if (m_inUpdatePolish)
+            ++m_polishInsideUpdatePolish;
+        else
+            m_polishInsideUpdatePolish = 0;
+
+        if (m_polishInsideUpdatePolish <= 2)
+            // allow at most two consecutive loops in order to respond to height-for-width
+            // (e.g QQuickText changes implicitHeight when its width gets changed)
+            polish();
+        else
+            qWarning() << "Qt Quick Layouts: Polish loop detected. Aborting after two iterations.";
     }
 }
 
diff --git a/src/imports/layouts/qquicklayout_p.h b/src/imports/layouts/qquicklayout_p.h
index cb46c41e6c..3322d03636 100644
--- a/src/imports/layouts/qquicklayout_p.h
+++ b/src/imports/layouts/qquicklayout_p.h
@@ -123,7 +123,9 @@ protected slots:
     void invalidateSenderItem();
 
 private:
-    bool m_dirty;
+    unsigned m_dirty : 1;
+    unsigned m_inUpdatePolish : 1;
+    unsigned m_polishInsideUpdatePolish : 2;
 
     Q_DECLARE_PRIVATE(QQuickLayout)
 
diff --git a/src/imports/layouts/qquicklinearlayout.cpp b/src/imports/layouts/qquicklinearlayout.cpp
index d89e575372..1004ed8593 100644
--- a/src/imports/layouts/qquicklinearlayout.cpp
+++ b/src/imports/layouts/qquicklinearlayout.cpp
@@ -469,6 +469,16 @@ void QQuickGridLayoutBase::rearrange(const QSizeF &size)
     if (!isReady())
         return;
 
+    const auto refCounter = qScopeGuard([&d] {
+        --(d->m_recurRearrangeCounter);
+    });
+    if (d->m_recurRearrangeCounter++ == 2) {
+        // allow a recursive depth of two in order to respond to height-for-width
+        // (e.g QQuickText changes implicitHeight when its width gets changed)
+        qWarning() << "Qt Quick Layouts: Detected recursive rearrange. Aborting after two iterations.";
+        return;
+    }
+
     d->m_rearranging = true;
     quickLayoutDebug() << objectName() << "QQuickGridLayoutBase::rearrange()" << size;
     Qt::LayoutDirection visualDir = effectiveLayoutDirection();
diff --git a/src/imports/layouts/qquicklinearlayout_p.h b/src/imports/layouts/qquicklinearlayout_p.h
index 634e51a048..f36f99741d 100644
--- a/src/imports/layouts/qquicklinearlayout_p.h
+++ b/src/imports/layouts/qquicklinearlayout_p.h
@@ -106,7 +106,8 @@ class QQuickGridLayoutBasePrivate : public QQuickLayoutPrivate
     Q_DECLARE_PUBLIC(QQuickGridLayoutBase)
 
 public:
-    QQuickGridLayoutBasePrivate() : m_rearranging(false)
+    QQuickGridLayoutBasePrivate() : m_recurRearrangeCounter(0)
+                                    , m_rearranging(false)
                                     , m_updateAfterRearrange(false)
                                     , m_layoutDirection(Qt::LeftToRight)
                                     {}
@@ -119,6 +120,7 @@ public:
 
     QQuickGridLayoutEngine engine;
     Qt::Orientation orientation;
+    unsigned m_recurRearrangeCounter : 2;
     unsigned m_rearranging : 1;
     unsigned m_updateAfterRearrange : 1;
     QVector<QQuickItem *> m_invalidateAfterRearrange;