summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-05-12 08:00:00 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-05-12 08:00:00 (GMT)
commit12dfbdc911fcc0778f7187afef59c1c9f1cb7050 (patch)
treeac4f79d19b2f11e98bd1f23c5684f24448437d1a
parentc7e351aa2f899aed619b896c627606ea24384321 (diff)
downloadQt-12dfbdc911fcc0778f7187afef59c1c9f1cb7050.zip
Qt-12dfbdc911fcc0778f7187afef59c1c9f1cb7050.tar.gz
Qt-12dfbdc911fcc0778f7187afef59c1c9f1cb7050.tar.bz2
Crash
-rw-r--r--src/declarative/fx/qfxlayouts.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/fx/qfxlayouts.cpp b/src/declarative/fx/qfxlayouts.cpp
index e95998b..53b367a 100644
--- a/src/declarative/fx/qfxlayouts.cpp
+++ b/src/declarative/fx/qfxlayouts.cpp
@@ -378,11 +378,11 @@ void QFxBaseLayout::preLayout()
if (d->aut & Horizontal)
setWidth(int(width));
- else
+ else if (itemParent())
setImplicitWidth(itemParent()->width());
if (d->aut & Vertical)
setHeight(int(height));
- else
+ else if (itemParent())
setImplicitHeight(itemParent()->height());
setLayoutItem(0);
}