diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-09-23 12:10:12 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-09-27 08:33:55 +0000 |
| commit | f63d48d474db7e9eff7583f1b8478228b13d3c82 (patch) | |
| tree | 4bc1dd1f4f7b2f9a5df5b40247e1a8245169b903 /src/qml/jsruntime/qv4qmlcontext.cpp | |
| parent | 1804fea8893c355dbd585e373cb9644387410a92 (diff) | |
Differentiate between finding for get and set in InternalClass
This is required, so we can get rid of the requirement that
getter and setter live next to each other in the member data.
Change-Id: I2ed57a171628af4dfecd1836d00e958c6bed9d4f
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4qmlcontext.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4qmlcontext.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4qmlcontext.cpp b/src/qml/jsruntime/qv4qmlcontext.cpp index b10065d308..cc0b0feeee 100644 --- a/src/qml/jsruntime/qv4qmlcontext.cpp +++ b/src/qml/jsruntime/qv4qmlcontext.cpp @@ -265,9 +265,9 @@ bool QQmlContextWrapper::virtualPut(Managed *m, PropertyKey id, const Value &val return false; QV4::Scoped<QQmlContextWrapper> wrapper(scope, resource); - auto member = wrapper->internalClass()->find(id); + auto member = wrapper->internalClass()->findValueOrSetter(id); if (member.index < UINT_MAX) - return wrapper->putValue(member.index, value); + return wrapper->putValue(member.index, member.attrs, value); // It's possible we could delay the calculation of the "actual" context (in the case // of sub contexts) until it is definitely needed. |