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/qv4context.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/qv4context.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4context.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4context.cpp b/src/qml/jsruntime/qv4context.cpp index 38e233965f..94b1a9fb73 100644 --- a/src/qml/jsruntime/qv4context.cpp +++ b/src/qml/jsruntime/qv4context.cpp @@ -295,11 +295,11 @@ ExecutionContext::Error ExecutionContext::setProperty(String *name, const Value Q_FALLTHROUGH(); case Heap::ExecutionContext::Type_GlobalContext: if (ctx->activation) { - uint member = ctx->activation->internalClass->indexOfValueOrGetter(id); - if (member < UINT_MAX) { + auto member = ctx->activation->internalClass->findValueOrSetter(id); + if (member.index < UINT_MAX) { Scope scope(engine); ScopedObject a(scope, ctx->activation); - if (!a->putValue(member, value)) + if (!a->putValue(member.index, member.attrs, value)) return TypeError; return NoError; } |