diff options
author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-12-30 17:06:02 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@digia.com> | 2015-01-08 12:34:25 +0100 |
commit | 486965a12e4b11ba6d5ab4578cd199e8f7ec4cb0 (patch) | |
tree | 922d5e8384b32ddb953cccdc1c2995fa0d46eceb /src/imports/localstorage | |
parent | bb29bebc8a205e33a4a0e9450040a78f4b3914d9 (diff) |
Remove v8engine pointer from QQmlV4Function
Change-Id: I68ddd79b8866ef9b8628a2eab1118d3ee3d72759
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/imports/localstorage')
-rw-r--r-- | src/imports/localstorage/plugin.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp index 6df795fa9f..8dfdde9e1a 100644 --- a/src/imports/localstorage/plugin.cpp +++ b/src/imports/localstorage/plugin.cpp @@ -668,13 +668,13 @@ public: void QQuickLocalStorage::openDatabaseSync(QQmlV4Function *args) { #ifndef QT_NO_SETTINGS - QV8Engine *engine = args->engine(); QV4::Scope scope(args->v4engine()); + QV8Engine *engine = scope.engine->v8Engine; QV4::ScopedContext ctx(scope, args->v4engine()->currentContext()); - if (engine->engine()->offlineStoragePath().isEmpty()) + if (scope.engine->qmlEngine()->offlineStoragePath().isEmpty()) V4THROW_SQL2(SQLEXCEPTION_DATABASE_ERR, QQmlEngine::tr("SQL: can't create database, offline storage is disabled.")); - qmlsqldatabase_initDatabasesPath(engine); + qmlsqldatabase_initDatabasesPath(scope.engine->v8Engine); QSqlDatabase database; @@ -689,7 +689,7 @@ void QQuickLocalStorage::openDatabaseSync(QQmlV4Function *args) md5.addData(dbname.toUtf8()); QString dbid(QLatin1String(md5.result().toHex())); - QString basename = qmlsqldatabase_databaseFile(dbid, engine); + QString basename = qmlsqldatabase_databaseFile(dbid, scope.engine->v8Engine); bool created = false; QString version = dbversion; |