From c0f961cd6b82a523e277f6d8778a20508b15697d Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 3 Aug 2017 20:26:28 +0200 Subject: Change function signatures for call/construct back Change those back again to return a value. This will be required to avoid creation of Scope objects between JS function calls. Change-Id: I05cb5cf8fd0c13dcefa60d213ccd5983fab57ea3 Reviewed-by: Erik Verbruggen --- src/imports/localstorage/plugin.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/imports/localstorage') diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp index a7d95cc295..940c285b87 100644 --- a/src/imports/localstorage/plugin.cpp +++ b/src/imports/localstorage/plugin.cpp @@ -411,7 +411,7 @@ static void qmlsqldatabase_changeVersion(const QV4::BuiltinFunction *, QV4::Scop callData->args[0] = w; TransactionRollback rollbackOnException(&db, &w->d()->inTransaction); - callback->call(scope, callData); + callback->call(callData); rollbackOnException.clear(); if (!db.commit()) { db.rollback(); @@ -459,7 +459,7 @@ static void qmlsqldatabase_transaction_shared(const QV4::BuiltinFunction *, QV4: callData->thisObject = scope.engine->globalObject; callData->args[0] = w; TransactionRollback rollbackOnException(&db, &w->d()->inTransaction); - callback->call(scope, callData); + callback->call(callData); rollbackOnException.clear(); if (!db.commit()) @@ -757,7 +757,7 @@ void QQuickLocalStorage::openDatabaseSync(QQmlV4Function *args) ScopedCallData callData(scope, 1); callData->thisObject = scope.engine->globalObject; callData->args[0] = db; - dbcreationCallback->call(scope, callData); + dbcreationCallback->call(callData); } args->setReturnValue(db.asReturnedValue()); -- cgit v1.2.3