diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-10 22:00:11 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-10 22:00:11 (GMT) |
| commit | fd570dca1319cd92daf0f73b10ea4e090ea15c23 (patch) | |
| tree | 9de1035b83cd857340e30e82e781f80cd1abc6ef /src/gui/graphicsview | |
| parent | 99e4ba7cb0700eb1a68d6db9fa8d058ddb59f233 (diff) | |
| parent | 3dc18b19ee2a02b93cc509a9162bf0a3900c6fd0 (diff) | |
| download | Qt-fd570dca1319cd92daf0f73b10ea4e090ea15c23.zip Qt-fd570dca1319cd92daf0f73b10ea4e090ea15c23.tar.gz Qt-fd570dca1319cd92daf0f73b10ea4e090ea15c23.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/gui/graphicsview')
| -rw-r--r-- | src/gui/graphicsview/qgraphicslayoutitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicslayoutitem.cpp b/src/gui/graphicsview/qgraphicslayoutitem.cpp index 3707591..634f68c 100644 --- a/src/gui/graphicsview/qgraphicslayoutitem.cpp +++ b/src/gui/graphicsview/qgraphicslayoutitem.cpp @@ -234,7 +234,7 @@ void QGraphicsLayoutItemPrivate::setSize(Qt::SizeHint which, const QSizeF &size) if (userSizeHints) { if (size == userSizeHints[which]) return; - } else if (!size.isValid()) { + } else if (size.width() < 0 && size.height() < 0) { return; } |