diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-06-24 22:46:58 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-06-24 22:46:58 (GMT) |
| commit | 329546aab7a9297813a6b6a28b23fd3750838ddb (patch) | |
| tree | 8bb631907fb5709e855ee5df3599701504a6f7c3 /src/declarative/fx | |
| parent | 098e1939cfdf675ae850912d898f1af0b2c660cc (diff) | |
| parent | 83449457780f4321595ec5f15056474cc22061da (diff) | |
| download | Qt-329546aab7a9297813a6b6a28b23fd3750838ddb.zip Qt-329546aab7a9297813a6b6a28b23fd3750838ddb.tar.gz Qt-329546aab7a9297813a6b6a28b23fd3750838ddb.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx')
| -rw-r--r-- | src/declarative/fx/qfxflowview.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/declarative/fx/qfxflowview.cpp b/src/declarative/fx/qfxflowview.cpp index e02e186..77cd6df 100644 --- a/src/declarative/fx/qfxflowview.cpp +++ b/src/declarative/fx/qfxflowview.cpp @@ -128,10 +128,11 @@ void QFxFlowView::refresh() { if (m_model && m_columns >= 1) { for (int ii = 0; ii < m_model->count(); ++ii) { - QFxItem *item = m_model->item(ii); - item->setParent(this); - item->setZ(0); - m_items << item; + if (QFxItem *item = m_model->item(ii)) { + item->setParent(this); + item->setZ(0); + m_items << item; + } } reflow(); |