diff options
| author | Robin Burchell <robin.burchell@crimson.no> | 2017-02-06 12:27:02 +0100 |
|---|---|---|
| committer | Robin Burchell <robin.burchell@crimson.no> | 2017-02-09 14:52:51 +0000 |
| commit | 78fb247e6aeeb07e3700be6410fae4327e48edb1 (patch) | |
| tree | 39b80e48f4c994eed84ea3615d7c25695a6ca4da /src/qml/jsruntime/qv4objectproto_p.h | |
| parent | 33f54d110953aafd21099b54007676837ea84630 (diff) | |
ObjectPrototype: Implement Object.assign from ES6
[ChangeLog][QtQml] Object.assign from the ES6 specification is now
implemented.
This fixes another bunch of failures on test/built-ins/Object/, from 375
to 348 failures.
Change-Id: I815b0f3b43efcd6af8f24b26c5215ce9943b3efa
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4objectproto_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4objectproto_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4objectproto_p.h b/src/qml/jsruntime/qv4objectproto_p.h index 1db8615511..44b54267f3 100644 --- a/src/qml/jsruntime/qv4objectproto_p.h +++ b/src/qml/jsruntime/qv4objectproto_p.h @@ -81,6 +81,7 @@ struct ObjectPrototype: Object static void method_getPrototypeOf(const BuiltinFunction *, Scope &scope, CallData *callData); static void method_getOwnPropertyDescriptor(const BuiltinFunction *, Scope &scope, CallData *callData); static void method_getOwnPropertyNames(const BuiltinFunction *, Scope &scope, CallData *callData); + static void method_assign(const BuiltinFunction *, Scope &scope, CallData *callData); static void method_create(const BuiltinFunction *, Scope &scope, CallData *callData); static void method_defineProperty(const BuiltinFunction *, Scope &scope, CallData *callData); static void method_defineProperties(const BuiltinFunction *, Scope &scope, CallData *callData); |