diff options
Diffstat (limited to 'src/imports/localstorage/plugin.cpp')
-rw-r--r-- | src/imports/localstorage/plugin.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp index 4de4a9520f..9d78773fe1 100644 --- a/src/imports/localstorage/plugin.cpp +++ b/src/imports/localstorage/plugin.cpp @@ -414,12 +414,12 @@ static ReturnedValue qmlsqldatabase_changeVersion(const QV4::BuiltinFunction *b, ok = false; db.transaction(); - JSCallData jsCall(scope, callback, 1); - jsCall->thisObject = scope.engine->globalObject; + JSCallData jsCall(scope, 1); + *jsCall->thisObject = scope.engine->globalObject; jsCall->args[0] = w; TransactionRollback rollbackOnException(&db, &w->d()->inTransaction); - jsCall.call(); + callback->call(jsCall); rollbackOnException.clear(); if (!db.commit()) { db.rollback(); @@ -464,11 +464,11 @@ static ReturnedValue qmlsqldatabase_transaction_shared(const QV4::BuiltinFunctio db.transaction(); if (callback) { - JSCallData jsCall(scope, callback, 1); - jsCall->thisObject = scope.engine->globalObject; + JSCallData jsCall(scope, 1); + *jsCall->thisObject = scope.engine->globalObject; jsCall->args[0] = w; TransactionRollback rollbackOnException(&db, &w->d()->inTransaction); - jsCall.call(); + callback->call(jsCall); rollbackOnException.clear(); if (!db.commit()) @@ -763,10 +763,10 @@ void QQuickLocalStorage::openDatabaseSync(QQmlV4Function *args) *db->d()->version = version; if (created && dbcreationCallback) { - JSCallData jsCall(scope, dbcreationCallback, 1); - jsCall->thisObject = scope.engine->globalObject; + JSCallData jsCall(scope, 1); + *jsCall->thisObject = scope.engine->globalObject; jsCall->args[0] = db; - jsCall.call(); + dbcreationCallback->call(jsCall); } args->setReturnValue(db.asReturnedValue()); |