diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-06-19 13:28:26 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-06-25 07:36:48 +0000 |
| commit | 1596112e146b28541bcee412ed159cdea7e692d0 (patch) | |
| tree | 29e858041496256c9c9c700fca4fb7220d78d46e /src/qml/qml/qqmlcomponent.cpp | |
| parent | 3823e9b94f849f8344b81250fac708ac2eaccd16 (diff) | |
Add Proxy support for prototype handling
Cleanup get/setPrototypeOf and fix some smaller incompatibilities
in the default implementation for Object.
Add the methods to the vtable and reimplement them according to
spec for ProxyObjects.
Clean up the Object.prototype.get/setPrototypeOf/__proto__ methods
and fix a smaller bug in the Reflect API for those methods.
Change-Id: I6e438753332ec4db963d6cdcf86f340ff212777a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlcomponent.cpp')
| -rw-r--r-- | src/qml/qml/qqmlcomponent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index 22e20de8d7..9986d3577a 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -1409,7 +1409,7 @@ void QQmlComponent::incubateObject(QQmlV4Function *args) QV4::Scoped<QV4::QmlIncubatorObject> r(scope, v4->memoryManager->allocate<QV4::QmlIncubatorObject>(mode)); QV4::ScopedObject p(scope, e->incubationProto.value()); - r->setPrototype(p); + r->setPrototypeOf(p); if (!valuemap->isUndefined()) r->d()->valuemap.set(scope.engine, valuemap); |