diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-11-27 08:56:03 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-12-17 11:01:10 +0100 |
| commit | 9d2a5ea28adf8ab35212ca8a71b479bc50960e3d (patch) | |
| tree | c59e0799ccf55f832f1e2bde02e256ef62ac2d19 /src/qml/jsruntime/qv4objectproto.cpp | |
| parent | a58893eeda6bd48f41bdfa19eda147343be5f81e (diff) | |
Return a Heap::Object in Object::prototype()
Change-Id: Ice0265ae558ba14497421a5bbf25ee9db76adab5
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4objectproto.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4objectproto.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4objectproto.cpp b/src/qml/jsruntime/qv4objectproto.cpp index a4e6b5f49b..aad894bd46 100644 --- a/src/qml/jsruntime/qv4objectproto.cpp +++ b/src/qml/jsruntime/qv4objectproto.cpp @@ -552,7 +552,7 @@ ReturnedValue ObjectPrototype::method_set_proto(CallContext *ctx) Scoped<Object> p(scope, ctx->d()->callData->args[0]); bool ok = false; if (!!p) { - if (o->prototype() == p.getPointer()) { + if (o->prototype() == p->d()) { ok = true; } else if (o->isExtensible()) { ok = o->setPrototype(p.getPointer()); |