diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-12 14:21:44 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-12 14:21:44 +0100 |
| commit | a20948b726c1e0edd70761e8e115a53ba5526a51 (patch) | |
| tree | cdcf3367f67c465f005a97dec6141e5a4e024781 /src/layouts | |
| parent | 3434a0d5f8cb4bb5008caec3772c4e398986196f (diff) | |
| parent | 1c54d411ad6e98c3779a412750aec8b93d587872 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/layouts/qquicklinearlayout.cpp
Change-Id: Ib24dab43c37fc0f3f6a85398766f102a1ac833c3
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 d09a07dc4..d3e5dd8f4 100644 --- a/src/layouts/qquicklinearlayout.cpp +++ b/src/layouts/qquicklinearlayout.cpp @@ -493,9 +493,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) |