diff options
| author | Albert Astals Cid <albert.astals@canonical.com> | 2013-04-30 12:22:36 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-30 22:38:44 +0200 |
| commit | fdee5c35288673002a24f4cf03fa8076d021be38 (patch) | |
| tree | 80522df23b7fe583c478a21547ed0e43e4f2296e /src/quick/items/qquickitemview.cpp | |
| parent | 3975ca99206de668ddc946bc31222e3caa01c2db (diff) | |
Protect against null item at QQuickItemView::destroyingItem
Change-Id: I92317d8f5a6d6f60160139f7486ffa8ec5985656
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'src/quick/items/qquickitemview.cpp')
| -rw-r--r-- | src/quick/items/qquickitemview.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp index d774091ef5..a6dabee7ba 100644 --- a/src/quick/items/qquickitemview.cpp +++ b/src/quick/items/qquickitemview.cpp @@ -2259,8 +2259,10 @@ void QQuickItemView::destroyingItem(QObject *object) { Q_D(QQuickItemView); QQuickItem* item = qmlobject_cast<QQuickItem*>(object); - item->setParentItem(0); - d->unrequestedItems.remove(item); + if (item) { + item->setParentItem(0); + d->unrequestedItems.remove(item); + } } bool QQuickItemViewPrivate::releaseItem(FxViewItem *item) |