diff options
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/localstorage/plugin.cpp | 6 | ||||
| -rw-r--r-- | src/imports/xmllistmodel/qqmlxmllistmodel.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp index be2f71e0ed..66c3365375 100644 --- a/src/imports/localstorage/plugin.cpp +++ b/src/imports/localstorage/plugin.cpp @@ -261,16 +261,16 @@ static v8::Handle<v8::Value> qmlsqldatabase_executeSql(const v8::Arguments& args v8::Local<v8::Array> array = v8::Local<v8::Array>::Cast(values); uint32_t size = array->Length(); for (uint32_t ii = 0; ii < size; ++ii) - query.bindValue(ii, engine->toVariant(array->Get(ii), -1)); + query.bindValue(ii, engine->toVariant(array->Get(ii)->v4Value(), -1)); } else if (values->IsObject() && !values->ToObject()->GetExternalResource()) { v8::Local<v8::Object> object = values->ToObject(); v8::Local<v8::Array> names = object->GetPropertyNames(); uint32_t size = names->Length(); for (uint32_t ii = 0; ii < size; ++ii) query.bindValue(names->Get(ii)->v4Value().toQString(), - engine->toVariant(object->Get(names->Get(ii)), -1)); + engine->toVariant(object->Get(names->Get(ii))->v4Value(), -1)); } else { - query.bindValue(0, engine->toVariant(values, -1)); + query.bindValue(0, engine->toVariant(values->v4Value(), -1)); } } if (query.exec()) { diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp index 4d0c509b2d..668479f5ba 100644 --- a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp +++ b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp @@ -926,7 +926,7 @@ QQmlV4Handle QQuickXmlListModel::get(int index) const Object *o = v4engine->newObject(); for (int ii = 0; ii < d->roleObjects.count(); ++ii) { Property *p = o->insertMember(v4engine->newIdentifier(d->roleObjects[ii]->name()), PropertyAttributes()); - p->value = v8engine->fromVariant(d->data.value(ii).value(index)).get()->v4Value(); + p->value = v8engine->fromVariant(d->data.value(ii).value(index)); } return QQmlV4Handle::fromValue(Value::fromObject(o)); |