diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-12-30 11:54:59 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2015-01-02 21:10:50 +0100 |
| commit | b9b12af83f121cdbc9bb1d3067bfb9e4ba923088 (patch) | |
| tree | ea39babccfddd814647c6852b597cad771a7d0b9 /src/qml/types | |
| parent | 2056538feab7739689742de4efe370b35864bc9a (diff) | |
Remove v8engine dependency in fromVariant conversions
Change-Id: I3427129dc7a0e68c8fa0b61f353835e2bee179a0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/types')
| -rw-r--r-- | src/qml/types/qqmldelegatemodel.cpp | 2 | ||||
| -rw-r--r-- | src/qml/types/qqmllistmodel.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp index d72ac4227c..ec8ad4ac4d 100644 --- a/src/qml/types/qqmldelegatemodel.cpp +++ b/src/qml/types/qqmldelegatemodel.cpp @@ -1825,7 +1825,7 @@ QV4::ReturnedValue QQmlDelegateModelItem::get_groups(QV4::CallContext *ctx) groups.append(o->d()->item->metaType->groupNames.at(i - 1)); } - return scope.engine->v8Engine->fromVariant(groups); + return QV8Engine::fromVariant(scope.engine, groups); } QV4::ReturnedValue QQmlDelegateModelItem::set_groups(QV4::CallContext *ctx) diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp index 083bbd6f1c..bac6aedcb2 100644 --- a/src/qml/types/qqmllistmodel.cpp +++ b/src/qml/types/qqmllistmodel.cpp @@ -1264,7 +1264,7 @@ void ModelNodeMetaObject::propertyWritten(int index) QVariant value = operator[](index); QV4::Scope scope(QV8Engine::getV4((eng))); - QV4::ScopedValue v(scope, eng->fromVariant(value)); + QV4::ScopedValue v(scope, QV8Engine::fromVariant(scope.engine, value)); int roleIndex = m_obj->m_model->m_listModel->setExistingProperty(m_obj->m_elementIndex, propName, v, eng); if (roleIndex != -1) { |