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/util | |
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/util')
-rw-r--r-- | src/qml/util/qqmladaptormodel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/util/qqmladaptormodel.cpp b/src/qml/util/qqmladaptormodel.cpp index 45c89631b1..678ff14b1a 100644 --- a/src/qml/util/qqmladaptormodel.cpp +++ b/src/qml/util/qqmladaptormodel.cpp @@ -345,11 +345,11 @@ QV4::ReturnedValue QQmlDMCachedModelData::get_property(QV4::CallContext *ctx, ui QQmlDMCachedModelData *modelData = static_cast<QQmlDMCachedModelData *>(o->d()->item); if (o->d()->item->index == -1) { if (!modelData->cachedData.isEmpty()) { - return ctx->d()->engine->v8Engine->fromVariant( + return QV8Engine::fromVariant(scope.engine, modelData->cachedData.at(modelData->type->hasModelData ? 0 : propertyId)); } } else if (*modelData->type->model) { - return ctx->d()->engine->v8Engine->fromVariant( + return QV8Engine::fromVariant(scope.engine, modelData->value(modelData->type->propertyRoles.at(propertyId))); } return QV4::Encode::undefined(); @@ -584,7 +584,7 @@ public: if (!o) return ctx->engine()->throwTypeError(QStringLiteral("Not a valid VisualData object")); - return scope.engine->v8Engine->fromVariant(static_cast<QQmlDMListAccessorData *>(o->d()->item)->cachedData); + return QV8Engine::fromVariant(scope.engine, static_cast<QQmlDMListAccessorData *>(o->d()->item)->cachedData); } static QV4::ReturnedValue set_modelData(QV4::CallContext *ctx) |