diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-08-18 15:26:45 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-08-23 19:18:15 +0000 |
| commit | f15cc9f1df8e17f049c111e3147d6c63c07eb756 (patch) | |
| tree | ae4daaa5e1cde31c0e412b84e9521f3745911657 /src/qml/jsruntime/qv4jscall_p.h | |
| parent | 6e2fc84646987135c96755fbe1c2af20fc722e3d (diff) | |
Implement IsConstructor for Function objects
Use the jsConstruct member in the function object for this
and set it to a nullptr for methods that are not a constructor.
Change-Id: I63d2971b23b2596a8e3b6d2781f0d9ed3208693b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4jscall_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4jscall_p.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4jscall_p.h b/src/qml/jsruntime/qv4jscall_p.h index 307eec9111..55cedf50aa 100644 --- a/src/qml/jsruntime/qv4jscall_p.h +++ b/src/qml/jsruntime/qv4jscall_p.h @@ -102,15 +102,13 @@ struct JSCallData { inline ReturnedValue FunctionObject::callAsConstructor(const JSCallData &data) const { - if (!d()->jsConstruct) - return engine()->throwTypeError(QStringLiteral("Object is not a constructor.")); - return d()->jsConstruct(this, data.args, data.argc, this); + return callAsConstructor(data.args, data.argc, this); } inline ReturnedValue FunctionObject::call(const JSCallData &data) const { - return d()->jsCall(this, data.thisObject, data.args, data.argc); + return call(data.thisObject, data.args, data.argc); } |