Merge branch '1.3'

This commit is contained in:
Sergio Martins
2021-03-31 10:01:18 +01:00
2 changed files with 8 additions and 0 deletions

View File

@@ -193,6 +193,9 @@ QSize MultiSplitter::availableSize() const
void MultiSplitter::layoutEqually() void MultiSplitter::layoutEqually()
{ {
if (!checkSanity())
return;
layoutEqually(m_rootItem); layoutEqually(m_rootItem);
} }

View File

@@ -2419,6 +2419,11 @@ void ItemBoxContainer::layoutEqually(SizingInfo::List &sizes)
} }
if (lengthToGive == 0) if (lengthToGive == 0)
return; return;
if (lengthToGive < 0) {
qWarning() << Q_FUNC_INFO << "Breaking infinit loop";
return;
}
} }
} }