diff options
Diffstat (limited to 'src/qml/jsruntime/qv4engine.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index 164ad176f3..0bb05896b0 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -260,6 +260,7 @@ ExecutionEngine::ExecutionEngine(EvalISelFactory *factory) id_byteLength = newIdentifier(QStringLiteral("byteLength")); id_byteOffset = newIdentifier(QStringLiteral("byteOffset")); id_buffer = newIdentifier(QStringLiteral("buffer")); + id_lastIndex = newIdentifier(QStringLiteral("lastIndex")); memberDataClass = InternalClass::create(this, MemberData::staticVTable(), 0); @@ -532,13 +533,13 @@ Heap::Object *ExecutionEngine::newObject(InternalClass *internalClass) return object->d(); } -Returned<String> *ExecutionEngine::newString(const QString &s) +Heap::String *ExecutionEngine::newString(const QString &s) { Scope scope(this); - return ScopedString(scope, memoryManager->alloc<String>(this, s))->asReturned<String>(); + return ScopedString(scope, memoryManager->alloc<String>(this, s))->d(); } -String *ExecutionEngine::newIdentifier(const QString &text) +Heap::String *ExecutionEngine::newIdentifier(const QString &text) { return identifierTable->insertString(text); } @@ -929,6 +930,7 @@ void ExecutionEngine::markObjects() id_byteLength->mark(this); id_byteOffset->mark(this); id_buffer->mark(this); + id_lastIndex->mark(this); objectCtor.mark(this); stringCtor.mark(this); |