diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-06-03 15:51:45 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2013-06-03 20:35:24 +0200 |
| commit | a336ca4cc35fdcabedf4ff2614cc6d6625e7d4ef (patch) | |
| tree | 76d4f14dc81051a255d7b82a8d40c2d0e30a7465 /src/qml/types | |
| parent | db628b278bdf67edbcfd60a4502dcc283f7a502d (diff) | |
Get rid of QV8Engine::toQObject and QV8QObjectWrapper::toQObject
Change-Id: I8726148093079b3385c6b0f16284af0b5ba92066
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/types')
| -rw-r--r-- | src/qml/types/qqmllistmodel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp index daaf43052d..85081e1251 100644 --- a/src/qml/types/qqmllistmodel.cpp +++ b/src/qml/types/qqmllistmodel.cpp @@ -454,7 +454,7 @@ void ListModel::set(int elementIndex, v8::Handle<v8::Object> object, QVector<int roleIndex = e->setDateTimeProperty(r, dt); } else if (propertyValue->IsObject()) { if (QV4::QObjectWrapper *wrapper = propertyValue->v4Value().as<QV4::QObjectWrapper>()) { - QObject *o = wrapper->object; + QObject *o = wrapper->object(); const ListLayout::Role &role = m_layout->getRoleOrCreate(propertyName, ListLayout::Role::QObject); if (role.type == ListLayout::Role::QObject) roleIndex = e->setQObjectProperty(role, o); @@ -529,7 +529,7 @@ void ListModel::set(int elementIndex, v8::Handle<v8::Object> object, QV8Engine * } } else if (propertyValue->IsObject()) { if (QV4::QObjectWrapper *wrapper = propertyValue->v4Value().as<QV4::QObjectWrapper>()) { - QObject *o = wrapper->object; + QObject *o = wrapper->object(); const ListLayout::Role &r = m_layout->getRoleOrCreate(propertyName, ListLayout::Role::QObject); if (r.type == ListLayout::Role::QObject) e->setQObjectPropertyFast(r, o); @@ -1190,7 +1190,7 @@ int ListElement::setJsProperty(const ListLayout::Role &role, v8::Handle<v8::Valu } else if (d->IsObject()) { QV4::QObjectWrapper *wrapper = d->v4Value().as<QV4::QObjectWrapper>(); if (role.type == ListLayout::Role::QObject && wrapper) { - QObject *o = wrapper->object; + QObject *o = wrapper->object(); roleIndex = setQObjectProperty(role, o); } else if (role.type == ListLayout::Role::VariantMap) { roleIndex = setVariantMapProperty(role, d->ToObject(), eng); |