diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-01 01:00:10 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-01 01:00:10 +0200 |
commit | bbc52bcbb6391c4925df26672eb1f26040c6f67c (patch) | |
tree | 14b8580e21aecc5b08a35f69ac55e7fbc3aef3ba /src/qml/jsruntime/qv4generatorobject_p.h | |
parent | 5ff4facd8efc41b30b5ffa5abb6a12406685ca0b (diff) | |
parent | cc0829cbf300e56360e3d61efe4dfd20efcabb1c (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I6e9b5fbf50da24cae9e555723a5f1d8365d4a2f3
Diffstat (limited to 'src/qml/jsruntime/qv4generatorobject_p.h')
-rw-r--r-- | src/qml/jsruntime/qv4generatorobject_p.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4generatorobject_p.h b/src/qml/jsruntime/qv4generatorobject_p.h index f00f730344..55e6091ad5 100644 --- a/src/qml/jsruntime/qv4generatorobject_p.h +++ b/src/qml/jsruntime/qv4generatorobject_p.h @@ -75,7 +75,7 @@ struct GeneratorFunctionCtor : FunctionObject { struct GeneratorFunction : ScriptFunction { }; -struct MemberGeneratorFunction : ScriptFunction { +struct MemberGeneratorFunction : MemberFunction { }; struct GeneratorPrototype : FunctionObject { @@ -113,12 +113,14 @@ struct GeneratorFunction : ScriptFunction static ReturnedValue virtualCall(const FunctionObject *f, const Value *thisObject, const Value *argv, int argc); }; -struct MemberGeneratorFunction : GeneratorFunction +struct MemberGeneratorFunction : MemberFunction { - V4_OBJECT2(MemberGeneratorFunction, GeneratorFunction) + V4_OBJECT2(MemberGeneratorFunction, MemberFunction) V4_INTERNALCLASS(MemberGeneratorFunction) - static Heap::FunctionObject *create(ExecutionContext *scope, Function *function, String *name); + static Heap::FunctionObject *create(ExecutionContext *scope, Function *function, Object *homeObject, String *name); + static constexpr VTable::CallAsConstructor virtualCallAsConstructor = nullptr; + static ReturnedValue virtualCall(const FunctionObject *f, const Value *thisObject, const Value *argv, int argc); }; struct GeneratorPrototype : Object |