qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clear the root index when the model is reset. 

Task-number: QTBUG-18839

Change-Id: I46608d7481d820fa74a9be60df1e018e70a761c6
Merge-request: 2598
Reviewed-by: Martin Jones <martin.jones@nokia.com>
(cherry picked from commit f6b7ce204ee88be0fedb4cfcff382f208fa4ed33)
This commit is contained in:
Girish Ramakrishnan 2011-04-27 15:53:43 +10:00 committed by Olivier Goffart
parent b2617d8096
commit 15407cfb5f
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
View File

@ -1398,7 +1398,12 @@ void QDeclarativeVisualDataModel::_q_layoutChanged()
void QDeclarativeVisualDataModel::_q_modelReset() void QDeclarativeVisualDataModel::_q_modelReset()
{ {
Q_D(QDeclarativeVisualDataModel);
d->m_root = QModelIndex();
emit modelReset(); emit modelReset();
emit rootIndexChanged();
if (d->m_abstractItemModel && d->m_abstractItemModel->canFetchMore(d->m_root))
d->m_abstractItemModel->fetchMore(d->m_root);
} }
void QDeclarativeVisualDataModel::_q_createdPackage(int index, QDeclarativePackage *package) void QDeclarativeVisualDataModel::_q_createdPackage(int index, QDeclarativePackage *package)

5
tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp
View File

@ -190,6 +190,11 @@ void tst_qdeclarativevisualdatamodel::rootIndex()
QMetaObject::invokeMethod(obj, "setRootToParent"); QMetaObject::invokeMethod(obj, "setRootToParent");
QVERIFY(qvariant_cast<QModelIndex>(obj->rootIndex()) == QModelIndex()); QVERIFY(qvariant_cast<QModelIndex>(obj->rootIndex()) == QModelIndex());
QMetaObject::invokeMethod(obj, "setRoot");
QVERIFY(qvariant_cast<QModelIndex>(obj->rootIndex()) == model.index(0,0));
model.clear(); // will emit modelReset()
QVERIFY(qvariant_cast<QModelIndex>(obj->rootIndex()) == QModelIndex());
delete obj; delete obj;
} }