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/qv4runtime.cpp | |
| 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/qv4runtime.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4runtime.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp index 82e1284289..9180108a0c 100644 --- a/src/qml/jsruntime/qv4runtime.cpp +++ b/src/qml/jsruntime/qv4runtime.cpp @@ -1550,8 +1550,9 @@ ReturnedValue Runtime::method_createClass(ExecutionEngine *engine, int classInde if (superClass.isNull()) { protoParent = Encode::null(); } else { + const FunctionObject *superFunction = superClass.as<FunctionObject>(); // ### check that the heritage object is a constructor - if (!superClass.isFunctionObject()) + if (!superFunction || !superFunction->isConstructor()) return engine->throwTypeError(QStringLiteral("The superclass is not a function object.")); const FunctionObject *s = static_cast<const FunctionObject *>(&superClass); ScopedValue result(scope, s->get(scope.engine->id_prototype())); |