diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-12-30 11:54:59 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2015-01-02 21:10:50 +0100 |
| commit | b9b12af83f121cdbc9bb1d3067bfb9e4ba923088 (patch) | |
| tree | ea39babccfddd814647c6852b597cad771a7d0b9 /src/imports | |
| parent | 2056538feab7739689742de4efe370b35864bc9a (diff) | |
Remove v8engine dependency in fromVariant conversions
Change-Id: I3427129dc7a0e68c8fa0b61f353835e2bee179a0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/localstorage/plugin.cpp | 3 | ||||
| -rw-r--r-- | src/imports/xmllistmodel/qqmlxmllistmodel.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp index 17a27bf8e3..8ee2742198 100644 --- a/src/imports/localstorage/plugin.cpp +++ b/src/imports/localstorage/plugin.cpp @@ -219,7 +219,6 @@ static QString qmlsqldatabase_databaseFile(const QString& connectionName, QV8Eng static ReturnedValue qmlsqldatabase_rows_index(QQmlSqlDatabaseWrapper *r, ExecutionEngine *v4, quint32 index, bool *hasProperty = 0) { Scope scope(v4); - QV8Engine *v8 = v4->v8Engine; if (r->d()->sqlQuery.at() == (int)index || r->d()->sqlQuery.seek(index)) { QSqlRecord record = r->d()->sqlQuery.record(); @@ -228,7 +227,7 @@ static ReturnedValue qmlsqldatabase_rows_index(QQmlSqlDatabaseWrapper *r, Execut for (int ii = 0; ii < record.count(); ++ii) { QVariant v = record.value(ii); ScopedString s(scope, v4->newIdentifier(record.fieldName(ii))); - ScopedValue val(scope, v.isNull() ? Encode::null() : v8->fromVariant(v)); + ScopedValue val(scope, v.isNull() ? Encode::null() : QV8Engine::fromVariant(v4, v)); row->put(s.getPointer(), val); } if (hasProperty) diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp index 225eedb578..7cd1a2f651 100644 --- a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp +++ b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp @@ -925,7 +925,7 @@ QQmlV4Handle QQuickXmlListModel::get(int index) const ScopedValue value(scope); for (int ii = 0; ii < d->roleObjects.count(); ++ii) { name = v4engine->newIdentifier(d->roleObjects[ii]->name()); - value = v8engine->fromVariant(d->data.value(ii).value(index)); + value = QV8Engine::fromVariant(v4engine, d->data.value(ii).value(index)); o->insertMember(name.getPointer(), value); } |