diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-14 11:25:02 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-18 13:14:13 +0200 |
| commit | f79df5da0769836bc866b470cdac43d6363dc7db (patch) | |
| tree | 28deb1584b6c43dca92b39328bcf43099a92fcd6 /src/qml/jsruntime/qv4include.cpp | |
| parent | e4e90923c93adfafb23c81be7359e8df2a500b4f (diff) | |
Convert more methods to return a Returned<>
Change-Id: If294c9c4f574824c308b63a11da1337226180105
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4include.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4include.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4include.cpp b/src/qml/jsruntime/qv4include.cpp index ac9a50c3a1..740bb406f3 100644 --- a/src/qml/jsruntime/qv4include.cpp +++ b/src/qml/jsruntime/qv4include.cpp @@ -196,11 +196,11 @@ QV4::ReturnedValue QV4Include::method_include(QV4::SimpleCallContext *ctx) QString localFile = QQmlFile::urlToLocalFileOrQrc(url); QV4::ScopedValue result(scope); + QV4::Scoped<QV4::Object> qmlcontextobject(scope, v4->qmlContextObject()); if (localFile.isEmpty()) { - QV4Include *i = new QV4Include(url, engine, context, - QV4::Value::fromObject(v4->qmlContextObject()), + qmlcontextobject.asValue(), callbackFunction); result = i->result(); @@ -213,8 +213,7 @@ QV4::ReturnedValue QV4Include::method_include(QV4::SimpleCallContext *ctx) QString code = QString::fromUtf8(data); QQmlScript::Parser::extractPragmas(code); - QV4::Scoped<QV4::Object> qmlglobal(scope, QV4::Value::fromObject(v4->qmlContextObject())); - QV4::Script script(v4, qmlglobal.getPointer(), code, url.toString()); + QV4::Script script(v4, qmlcontextobject.getPointer(), code, url.toString()); QV4::ExecutionContext *ctx = v4->current; try { |