summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan-Arve Sæther <jan-arve.saether@nokia.com>2010-09-10 11:25:41 (GMT)
committerJan-Arve Sæther <jan-arve.saether@nokia.com>2010-09-10 12:00:19 (GMT)
commit8a43ccdaf3bbd1e77045cbb63231e201ea23896f (patch)
tree4f86a89fa736f4ff370403d93f731f99e70092c9 /src
parent0472a8d312f2040f42ee817d05dd6e765260de88 (diff)
downloadQt-8a43ccdaf3bbd1e77045cbb63231e201ea23896f.zip
Qt-8a43ccdaf3bbd1e77045cbb63231e201ea23896f.tar.gz
Qt-8a43ccdaf3bbd1e77045cbb63231e201ea23896f.tar.bz2
Fix a regression where setPreferredSize(QSize(100, -1)) did not work.
Regressed by change 515991426832a6333f2fd9e639bd4c83e2b27cef Reviewed-by: Frederik Gladhorn
Diffstat (limited to 'src')
-rw-r--r--src/gui/graphicsview/qgraphicslayoutitem.cpp2
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;
}