diff options
Diffstat (limited to 'src/qml')
| -rw-r--r-- | src/qml/jsruntime/qv4function.cpp | 4 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4globalobject.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4function.cpp b/src/qml/jsruntime/qv4function.cpp index 65fec54be6..291d7cc033 100644 --- a/src/qml/jsruntime/qv4function.cpp +++ b/src/qml/jsruntime/qv4function.cpp @@ -65,14 +65,14 @@ Function::Function(ExecutionEngine *engine, CompiledData::CompilationUnit *unit, formals.fill(0); const quint32 *formalsIndices = compiledFunction->formalsTable(); for (int i = 0; i < compiledFunction->nFormals; ++i) - formals[i] = engine->newString(unit->data->stringAt(formalsIndices[i]))->getPointer(); + formals[i] = compilationUnit->runtimeStrings[formalsIndices[i]].asString(); locals.resize(compiledFunction->nLocals); locals.fill(0); const quint32 *localsIndices = compiledFunction->localsTable(); for (int i = 0; i < compiledFunction->nLocals; ++i) - locals[i] = engine->newString(unit->data->stringAt(localsIndices[i]))->getPointer(); + locals[i] = compilationUnit->runtimeStrings[localsIndices[i]].asString(); } Function::~Function() diff --git a/src/qml/jsruntime/qv4globalobject.cpp b/src/qml/jsruntime/qv4globalobject.cpp index 390fffff8a..3b1e0b1bae 100644 --- a/src/qml/jsruntime/qv4globalobject.cpp +++ b/src/qml/jsruntime/qv4globalobject.cpp @@ -389,7 +389,7 @@ ReturnedValue EvalFunction::evalCall(CallData *callData, bool directCall) needsActivation = function->needsActivation(); if (strictMode) { - FunctionObject *e = FunctionObject::creatScriptFunction(ctx, function); + ScopedFunctionObject e(scope, FunctionObject::creatScriptFunction(ctx, function)); ScopedCallData callData(scope, 0); callData->thisObject = ctx->callData->thisObject; return e->call(callData); |