diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2011-01-17 15:58:27 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2011-01-17 15:58:27 (GMT) |
| commit | 0cfda20a6dc0d1072cfb2c58e6d1ed7c9308ac14 (patch) | |
| tree | 096241106afeccb08b49fbf9d96f327ac71b8112 /src/gui/graphicsview | |
| parent | af810e444ee73b112623128a3637b28b81f3f2fb (diff) | |
| parent | 595fdf64402204bd983b2a7c5f888cc1982cd742 (diff) | |
| download | Qt-0cfda20a6dc0d1072cfb2c58e6d1ed7c9308ac14.zip Qt-0cfda20a6dc0d1072cfb2c58e6d1ed7c9308ac14.tar.gz Qt-0cfda20a6dc0d1072cfb2c58e6d1ed7c9308ac14.tar.bz2 | |
Merge branch '4.7-review' into 4.7-staging
Diffstat (limited to 'src/gui/graphicsview')
| -rw-r--r-- | src/gui/graphicsview/qgridlayoutengine.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/graphicsview/qgridlayoutengine.cpp b/src/gui/graphicsview/qgridlayoutengine.cpp index 8f833f8..cd30dfb 100644 --- a/src/gui/graphicsview/qgridlayoutengine.cpp +++ b/src/gui/graphicsview/qgridlayoutengine.cpp @@ -194,7 +194,8 @@ void QGridLayoutRowData::distributeMultiCells(const QGridLayoutRowInfo &rowInfo) for (int k = 0; k < span; ++k) { boxes[start + k].combine(extras[k]); - stretches[start + k] = qMax(stretches[start + k], stretch); + if (stretch != 0) + stretches[start + k] = qMax(stretches[start + k], stretch); } } multiCellMap.clear(); @@ -1472,7 +1473,7 @@ void QGridLayoutEngine::fillRowData(QGridLayoutRowData *rowData, const QLayoutSt QGridLayoutBox *box; if (effectiveRowSpan == 1) { box = &rowBox; - if (!userRowStretch) + if (!userRowStretch && itemStretch != 0) rowStretch = qMax(rowStretch, itemStretch); } else { QGridLayoutMultiCellData &multiCell = |