diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-04-07 03:16:21 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-04-07 03:16:21 (GMT) |
| commit | 1d27a2ace38d1098ef639086330a6fb88d8833d9 (patch) | |
| tree | 76be3b60dace5f28cb61c25e15625a80c7fb9d00 /src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp | |
| parent | fd2c621c0f291cbfea5bd0c85e19f2cc6ae07bed (diff) | |
| parent | 062e30769c2b04a5d8d0906c39a2bcb35defd3a2 (diff) | |
| download | Qt-1d27a2ace38d1098ef639086330a6fb88d8833d9.zip Qt-1d27a2ace38d1098ef639086330a6fb88d8833d9.tar.gz Qt-1d27a2ace38d1098ef639086330a6fb88d8833d9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp index dfd9c0c..174459b 100644 --- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp +++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp @@ -662,6 +662,7 @@ void QDeclarativeVisualDataModel::setModel(const QVariant &model) this, SLOT(_q_itemsRemoved(int,int))); QObject::disconnect(d->m_listModelInterface, SIGNAL(itemsMoved(int,int,int)), this, SLOT(_q_itemsMoved(int,int,int))); + QObject::disconnect(d->m_listModelInterface, SIGNAL(modelReset()), this, SLOT(_q_modelReset())); d->m_listModelInterface = 0; } else if (d->m_abstractItemModel) { QObject::disconnect(d->m_abstractItemModel, SIGNAL(rowsInserted(const QModelIndex &,int,int)), @@ -705,6 +706,7 @@ void QDeclarativeVisualDataModel::setModel(const QVariant &model) this, SLOT(_q_itemsRemoved(int,int))); QObject::connect(d->m_listModelInterface, SIGNAL(itemsMoved(int,int,int)), this, SLOT(_q_itemsMoved(int,int,int))); + QObject::connect(d->m_listModelInterface, SIGNAL(modelReset()), this, SLOT(_q_modelReset())); d->m_metaDataCacheable = true; if (d->m_delegate && d->m_listModelInterface->count()) emit itemsInserted(0, d->m_listModelInterface->count()); |