qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correct merge reorder issue with the revert patch 

This is a follow-up patch to revert the complete change made in patch
9ad9d05f26 and
d85de8da60.

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 d85de8da60 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 <jan-arve.saether@qt.io>
This commit is contained in:
Santhosh Kumar 2024-01-17 12:39:54 +01:00
parent 3df0ac24c3
commit 2b925eb9b9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/quicklayouts/qquicklayout.cpp
View File

@ -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;