diff options
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/testlib/main.cpp | 4 | ||||
| -rw-r--r-- | src/imports/xmllistmodel/qqmlxmllistmodel.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/testlib/main.cpp b/src/imports/testlib/main.cpp index bd13056dcb..d854a26af5 100644 --- a/src/imports/testlib/main.cpp +++ b/src/imports/testlib/main.cpp @@ -97,7 +97,7 @@ public Q_SLOTS: } } - return QQmlV4Handle::fromV8Handle(v8::String::New(name.toUtf8())); + return QQmlV4Handle(v8::String::New(name.toUtf8())->v4Value()); } bool compare(const QVariant& act, const QVariant& exp) const { @@ -110,7 +110,7 @@ public Q_SLOTS: int count = stacks->GetFrameCount(); if (count >= frameIndex + 1) { v8::Handle<v8::StackFrame> frame = stacks->GetFrame(frameIndex + 1); - return QQmlV4Handle::fromV8Handle(frame->GetScriptNameOrSourceURL()); + return QQmlV4Handle(frame->GetScriptNameOrSourceURL()->v4Value()); } return QQmlV4Handle(); } diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp index 77c04bed61..e814eda04b 100644 --- a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp +++ b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp @@ -919,7 +919,7 @@ QQmlV4Handle QQuickXmlListModel::get(int index) const Q_D(const QQuickXmlListModel); if (index < 0 || index >= count()) - return QQmlV4Handle::fromValue(Value::undefinedValue()); + return QQmlV4Handle(Value::undefinedValue()); QQmlEngine *engine = qmlContext(this)->engine(); QV8Engine *v8engine = QQmlEnginePrivate::getV8Engine(engine); @@ -930,7 +930,7 @@ QQmlV4Handle QQuickXmlListModel::get(int index) const p->value = v8engine->fromVariant(d->data.value(ii).value(index)); } - return QQmlV4Handle::fromValue(Value::fromObject(o)); + return QQmlV4Handle(Value::fromObject(o)); } /*! |