From 2b925eb9b925665afb83cb11addbc9cb7319ae41 Mon Sep 17 00:00:00 2001 From: Santhosh Kumar Date: Wed, 17 Jan 2024 12:39:54 +0100 Subject: [PATCH] Correct merge reorder issue with the revert patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a follow-up patch to revert the complete change made in patch 9ad9d05f26184a79ad3fe09abdc662949088d19d and d85de8da6011731e3ff31ae1361e71fecaedb0be. There are separate patches made to revert these changes but the order in which these revert patches merged (in 6.7 branch) was incorrect. This further triggers issue in other branches. This patch fixes the issue happened due to merge reordering. Its to be noted that patch d85de8da6011731e3ff31ae1361e71fecaedb0be not been merged to 6.6 and 6.5 branches but still this patch is required to revert the complete change in those branches. Pick-to: 6.6 6.5 Change-Id: I875b13741bccc36c4a4892e5d71b6c7aa7e3b031 Reviewed-by: Jan Arve Sæther --- src/quicklayouts/qquicklayout.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/quicklayouts/qquicklayout.cpp b/src/quicklayouts/qquicklayout.cpp index 28a99ced9e..5a6b30ff38 100644 --- a/src/quicklayouts/qquicklayout.cpp +++ b/src/quicklayouts/qquicklayout.cpp @@ -925,7 +925,7 @@ void QQuickLayout::geometryChange(const QRectF &newGeometry, const QRectF &oldGe { Q_D(QQuickLayout); QQuickItem::geometryChange(newGeometry, oldGeometry); - if (invalidated() || d->m_disableRearrange || !isReady()) + if (d->m_disableRearrange || !isReady()) return; qCDebug(lcQuickLayouts) << "QQuickLayout::geometryChange" << newGeometry << oldGeometry;