diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-01-13 17:22:08 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2015-01-16 21:12:57 +0100 |
| commit | 498d4322ce87b20a798d4c9fbf4f7d84c1730486 (patch) | |
| tree | f2bd8763b894d3a50f2007a1af8df03a0c3fa83d /src/qml/jsruntime/qv4context.cpp | |
| parent | 8ffb79bbd214c239e414dc4e9cf4569b3219bdab (diff) | |
Don't require an ExecutionEngine member in String anymore
Change-Id: I7c1a5471507669871564d79dc17d1026c268b6d0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4context.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4context.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4context.cpp b/src/qml/jsruntime/qv4context.cpp index 40c02ef4ee..408ccf051a 100644 --- a/src/qml/jsruntime/qv4context.cpp +++ b/src/qml/jsruntime/qv4context.cpp @@ -343,7 +343,7 @@ ReturnedValue ExecutionContext::getProperty(String *name) { Scope scope(this); ScopedValue v(scope); - name->makeIdentifier(); + name->makeIdentifier(scope.engine); if (name->equals(d()->engine->id_this)) return d()->callData->thisObject.asReturnedValue(); @@ -410,7 +410,7 @@ ReturnedValue ExecutionContext::getPropertyAndBase(String *name, Heap::Object ** Scope scope(this); ScopedValue v(scope); *base = (Heap::Object *)0; - name->makeIdentifier(); + name->makeIdentifier(scope.engine); if (name->equals(d()->engine->id_this)) return d()->callData->thisObject.asReturnedValue(); |