From 61440411a979c7c317bafccfbf5201d969819a06 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 25 Jun 2018 23:18:33 +0200 Subject: Prefix vtable methods with virtual Turns out that the overloading of vtable methods and regular ones is problematic in some cases. So let's rather make it explicit which methods are part of the vtable, and which aren't. Change-Id: Ifee32a26104d30f3c82bca8b5a9cdea2d4f4f526 Reviewed-by: Simon Hausmann --- src/qml/jsruntime/qv4objectproto.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/qml/jsruntime/qv4objectproto.cpp') diff --git a/src/qml/jsruntime/qv4objectproto.cpp b/src/qml/jsruntime/qv4objectproto.cpp index 81d50a01db..4c57e617ae 100644 --- a/src/qml/jsruntime/qv4objectproto.cpp +++ b/src/qml/jsruntime/qv4objectproto.cpp @@ -63,7 +63,7 @@ void Heap::ObjectCtor::init(QV4::ExecutionContext *scope) Heap::FunctionObject::init(scope, QStringLiteral("Object")); } -ReturnedValue ObjectCtor::callAsConstructor(const FunctionObject *f, const Value *argv, int argc) +ReturnedValue ObjectCtor::virtualCallAsConstructor(const FunctionObject *f, const Value *argv, int argc) { ExecutionEngine *v4 = f->engine(); const ObjectCtor *ctor = static_cast(f); @@ -79,7 +79,7 @@ ReturnedValue ObjectCtor::callAsConstructor(const FunctionObject *f, const Value } } -ReturnedValue ObjectCtor::call(const FunctionObject *m, const Value *, const Value *argv, int argc) +ReturnedValue ObjectCtor::virtualCall(const FunctionObject *m, const Value *, const Value *argv, int argc) { ExecutionEngine *v4 = m->engine(); if (!argc || argv[0].isUndefined() || argv[0].isNull()) { -- cgit v1.2.3