diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-01-05 14:32:02 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-01-05 14:32:02 (GMT) |
| commit | afcdce4739aa030afa41400fa403b6f69302008f (patch) | |
| tree | 107d21cd573b7464f75ab1bf631b4ba3796a6970 /src/gui | |
| parent | 884c729545c49e3f21559c8eb397508ab9fe6e6b (diff) | |
| parent | 43a9da5339b38ca2b4e507efe2d4fa72df6b2ff3 (diff) | |
| download | Qt-afcdce4739aa030afa41400fa403b6f69302008f.zip Qt-afcdce4739aa030afa41400fa403b6f69302008f.tar.gz Qt-afcdce4739aa030afa41400fa403b6f69302008f.tar.bz2 | |
Merge branch 'QT-2261' into 4.6
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/graphicsview/qgridlayoutengine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/graphicsview/qgridlayoutengine.cpp b/src/gui/graphicsview/qgridlayoutengine.cpp index 9497a2f..1fece7a 100644 --- a/src/gui/graphicsview/qgridlayoutengine.cpp +++ b/src/gui/graphicsview/qgridlayoutengine.cpp @@ -182,9 +182,9 @@ void QGridLayoutRowData::distributeMultiCells() QVarLengthArray<qreal> newSizes(span); for (int j = 0; j < NSizes; ++j) { - qreal extra = compare(totalBox, box, j); + qreal extra = compare(box, totalBox, j); if (extra > 0.0) { - calculateGeometries(start, end, totalBox.q_sizes(j), dummy.data(), newSizes.data(), + calculateGeometries(start, end, box.q_sizes(j), dummy.data(), newSizes.data(), 0, totalBox); for (int k = 0; k < span; ++k) |