aboutsummaryrefslogtreecommitdiffstats
path: root/src/qtquick1/graphicsitems/qdeclarativegridview.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/qtquick1/graphicsitems/qdeclarativegridview.cpp')
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativegridview.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qtquick1/graphicsitems/qdeclarativegridview.cpp b/src/qtquick1/graphicsitems/qdeclarativegridview.cpp
index 63b907b022..3375afff51 100644
--- a/src/qtquick1/graphicsitems/qdeclarativegridview.cpp
+++ b/src/qtquick1/graphicsitems/qdeclarativegridview.cpp
@@ -2748,7 +2748,7 @@ void QDeclarative1GridView::trackedPositionChanged()
void QDeclarative1GridView::itemsInserted(int modelIndex, int count)
{
Q_D(QDeclarative1GridView);
- if (!isComponentComplete())
+ if (!isComponentComplete() || !d->model || !d->model->isValid())
return;
int index = d->visibleItems.count() ? d->mapFromModel(modelIndex) : 0;
@@ -2879,7 +2879,7 @@ void QDeclarative1GridView::itemsInserted(int modelIndex, int count)
void QDeclarative1GridView::itemsRemoved(int modelIndex, int count)
{
Q_D(QDeclarative1GridView);
- if (!isComponentComplete())
+ if (!isComponentComplete() || !d->model || !d->model->isValid())
return;
d->itemCount -= count;
@@ -2979,7 +2979,7 @@ void QDeclarative1GridView::destroyRemoved()
void QDeclarative1GridView::itemsMoved(int from, int to, int count)
{
Q_D(QDeclarative1GridView);
- if (!isComponentComplete())
+ if (!isComponentComplete() || !d->isValid())
return;
QHash<int,FxGridItem1*> moved;