diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-06-25 23:18:33 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-07-03 08:08:35 +0000 |
| commit | 61440411a979c7c317bafccfbf5201d969819a06 (patch) | |
| tree | 6c5825e21e75587121351bc612a76a7af81ef7be /src/qml/jsruntime/qv4qmlcontext_p.h | |
| parent | 2aabdd187aae8a953cfcebac8f6c1ba7b19a0727 (diff) | |
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 <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4qmlcontext_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4qmlcontext_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4qmlcontext_p.h b/src/qml/jsruntime/qv4qmlcontext_p.h index 2f76b8efd7..b9061a3f58 100644 --- a/src/qml/jsruntime/qv4qmlcontext_p.h +++ b/src/qml/jsruntime/qv4qmlcontext_p.h @@ -98,8 +98,8 @@ struct Q_QML_EXPORT QQmlContextWrapper : Object void setReadOnly(bool b) { d()->readOnly = b; } - static ReturnedValue get(const Managed *m, PropertyKey id, const Value *receiver, bool *hasProperty); - static bool put(Managed *m, PropertyKey id, const Value &value, Value *receiver); + static ReturnedValue virtualGet(const Managed *m, PropertyKey id, const Value *receiver, bool *hasProperty); + static bool virtualPut(Managed *m, PropertyKey id, const Value &value, Value *receiver); }; struct Q_QML_EXPORT QmlContext : public ExecutionContext |