++it;
}
// Add modelData property
- if (m_roles.count() == 1)
+ if (m_roles.count() == 1 && !m_roleNames.contains("modelData"))
m_modelDataPropId = m_delegateDataType->createProperty("modelData") - m_delegateDataType->propertyOffset();
m_metaDataCreated = true;
}
qmlInfo(this) << "Changing role not present in item: " << roleName;
}
}
- if (d->m_roles.count() == 1) {
+ if (d->m_modelDataPropId != -1) {
// Handle the modelData role we add if there is just one role.
- int propId = data->modelDataPropertyId();
- if (data->hasValue(propId)) {
+ if (data->hasValue(d->m_modelDataPropId)) {
int role = d->m_roles.at(0);
if (d->m_listModelInterface) {
- data->setValue(propId, d->m_listModelInterface->data(idx, role));
+ data->setValue(d->m_modelDataPropId, 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));
+ data->setValue(d->m_modelDataPropId, d->m_abstractItemModel->data(index, role));
}
}
}
Q_OBJECT
public:
- SingleRoleModel(QObject *parent = 0) {
+ SingleRoleModel(const QByteArray &role = "name", QObject *parent = 0) {
QHash<int, QByteArray> roles;
- roles.insert(Qt::DisplayRole , "name");
+ roles.insert(Qt::DisplayRole , role);
setRoleNames(roles);
list << "one" << "two" << "three" << "four";
}
model.set(1, "Changed");
QCOMPARE(name->text(), QString("Changed"));
}
+ {
+ QSGView view;
+
+ SingleRoleModel model("modelData");
+
+ QDeclarativeContext *ctxt = view.rootContext();
+ ctxt->setContextProperty("myModel", &model);
+
+ view.setSource(QUrl::fromLocalFile(SRCDIR "/data/singlerole2.qml"));
+
+ QSGListView *listview = qobject_cast<QSGListView*>(view.rootObject());
+ QVERIFY(listview != 0);
+
+ QSGItem *contentItem = listview->contentItem();
+ QVERIFY(contentItem != 0);
+
+ QSGText *name = findItem<QSGText>(contentItem, "name", 1);
+ QCOMPARE(name->text(), QString("two"));
+
+ model.set(1, "Changed");
+ QCOMPARE(name->text(), QString("Changed"));
+ }
}
void tst_qsgvisualdatamodel::modelProperties()