diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-17 11:37:03 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-17 11:37:03 +0100 |
| commit | 9ef983d05df921d47cc0827670a8e3481bcc84ef (patch) | |
| tree | 0e38f79c465401c197554ba325101711a3e6c670 /src/layouts | |
| parent | 04ab2428e004f01f630eb5117255bb85f5390fb4 (diff) | |
| parent | a20948b726c1e0edd70761e8e115a53ba5526a51 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/layouts')
| -rw-r--r-- | src/layouts/qquicklinearlayout.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/layouts/qquicklinearlayout.cpp b/src/layouts/qquicklinearlayout.cpp index 9ff68a055..4af3a76fe 100644 --- a/src/layouts/qquicklinearlayout.cpp +++ b/src/layouts/qquicklinearlayout.cpp @@ -499,9 +499,10 @@ void QQuickGridLayoutBase::rearrange(const QSizeF &size) qSwap(left, right); */ - d->engine.setGeometries(QRectF(QPointF(0,0), size), d->styleInfo); - + // Set m_dirty to false in case size hint changes during arrangement. + // This could happen if there is a binding like implicitWidth: height QQuickLayout::rearrange(size); + d->engine.setGeometries(QRectF(QPointF(0,0), size), d->styleInfo); } bool QQuickGridLayoutBase::shouldIgnoreItem(QQuickItem *child, QQuickLayoutAttached *&info, QSizeF *sizeHints) |