diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-06-06 14:52:07 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2013-06-07 18:32:55 +0200 |
| commit | ac15ec470ebc8fe0e66550ce1183187e3868bb40 (patch) | |
| tree | eed2590ff5535315839898d15ca3b31e0a70ec3f /src/qml/qml/qqmlvaluetypewrapper.cpp | |
| parent | e058cc234c7bb3065b092bed304b7da9f3f98bed (diff) | |
Get rid of QV8QObjectWrapper::getProperty
Replace the call sites with calls to getQmlProperty on the QObjectWrapper.
Change-Id: I3dbc3788c8d1631d817f65c738f0a8a31deb2866
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlvaluetypewrapper.cpp')
| -rw-r--r-- | src/qml/qml/qqmlvaluetypewrapper.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp index abf0be7eff..955ea04298 100644 --- a/src/qml/qml/qqmlvaluetypewrapper.cpp +++ b/src/qml/qml/qqmlvaluetypewrapper.cpp @@ -45,6 +45,7 @@ #include <private/qqmlvaluetype_p.h> #include <private/qqmlbinding_p.h> #include <private/qqmlglobal_p.h> +#include <private/qqmlcontextwrapper_p.h> #include <private/qv4engine_p.h> #include <private/qv4functionobject_p.h> @@ -283,8 +284,8 @@ Value QmlValueTypeWrapper::get(Managed *m, ExecutionContext *ctx, String *name, if (result->isFunction()) { // calling a Q_INVOKABLE function of a value type - QQmlContextData *context = r->v8->callingContext(); - return r->v8->qobjectWrapper()->getProperty(r->type, propertystring, context, QV4::QObjectWrapper::IgnoreRevision)->v4Value(); + QQmlContextData *qmlContext = QV4::QmlContextWrapper::callingContext(ctx->engine); + return QV4::QObjectWrapper::wrap(ctx->engine, r->type).as<QV4::QObjectWrapper>()->getQmlProperty(ctx, qmlContext, name, QV4::QObjectWrapper::IgnoreRevision); } #define VALUE_TYPE_LOAD(metatype, cpptype, constructor) \ |