diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-08-12 07:12:25 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-08-12 07:12:25 (GMT) |
| commit | 224d8f7619447a4784da533ac26760ea1e7b9087 (patch) | |
| tree | 5407614135100025a375acf049ace2074e3e6f11 /src/gui/graphicsview/qgraphicsgridlayout.cpp | |
| parent | e7a19af4430b45f371bb33120f0ed39a2c83b733 (diff) | |
| parent | add9c43407a63c28f1107b9a77e74f6f62593246 (diff) | |
| download | Qt-224d8f7619447a4784da533ac26760ea1e7b9087.zip Qt-224d8f7619447a4784da533ac26760ea1e7b9087.tar.gz Qt-224d8f7619447a4784da533ac26760ea1e7b9087.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7
Diffstat (limited to 'src/gui/graphicsview/qgraphicsgridlayout.cpp')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsgridlayout.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsgridlayout.cpp b/src/gui/graphicsview/qgraphicsgridlayout.cpp index 062b5ac..3fc7f10 100644 --- a/src/gui/graphicsview/qgraphicsgridlayout.cpp +++ b/src/gui/graphicsview/qgraphicsgridlayout.cpp @@ -641,7 +641,8 @@ QSizeF QGraphicsGridLayout::sizeHint(Qt::SizeHint which, const QSizeF &constrain Q_D(const QGraphicsGridLayout); qreal left, top, right, bottom; getContentsMargins(&left, &top, &right, &bottom); - return d->engine.sizeHint(d->styleInfo(), which , constraint) + QSizeF(left + right, top + bottom); + const QSizeF extraMargins(left + right, top + bottom); + return d->engine.sizeHint(d->styleInfo(), which , constraint - extraMargins) + extraMargins; } |