diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-21 02:33:46 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-21 02:33:46 (GMT) |
| commit | bf37d0708afbf4df8eb4ffcba60538a53083edaa (patch) | |
| tree | 7bfe7fb779035ecc6f3942000d3205c805d2475d | |
| parent | 660ec910ef60513b511e2292255e53701dbb239b (diff) | |
| parent | b69686dd0e8701bf6e8f4e7c215dba7e8168d603 (diff) | |
| download | Qt-bf37d0708afbf4df8eb4ffcba60538a53083edaa.zip Qt-bf37d0708afbf4df8eb4ffcba60538a53083edaa.tar.gz Qt-bf37d0708afbf4df8eb4ffcba60538a53083edaa.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Small optimization for QDeclarativeVisualDataModel.
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp index a70886e..7b48758 100644 --- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp +++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp @@ -1187,7 +1187,7 @@ void QDeclarativeVisualDataModel::_q_itemsChanged(int index, int count, if (propId != -1) { if (data->hasValue(propId)) { if (d->m_listModelInterface) { - data->setValue(propId, d->m_listModelInterface->data(idx, QList<int>() << role).value(role)); + data->setValue(propId, d->m_listModelInterface->data(idx, role)); } else if (d->m_abstractItemModel) { QModelIndex index = d->m_abstractItemModel->index(idx, 0, d->m_root); data->setValue(propId, d->m_abstractItemModel->data(index, role)); @@ -1208,7 +1208,7 @@ void QDeclarativeVisualDataModel::_q_itemsChanged(int index, int count, if (data->hasValue(propId)) { int role = roles.at(0); if (d->m_listModelInterface) { - data->setValue(propId, d->m_listModelInterface->data(idx, QList<int>() << role).value(role)); + data->setValue(propId, d->m_listModelInterface->data(idx, role)); } else if (d->m_abstractItemModel) { QModelIndex index = d->m_abstractItemModel->index(idx, 0, d->m_root); data->setValue(propId, d->m_abstractItemModel->data(index, role)); |