diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-23 15:52:10 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-26 09:05:16 +0200 |
| commit | 12fd2ccd3fa2dc0133b5a3fb89f9fdf5cf721232 (patch) | |
| tree | 880acb9c7c0d8289185b6aebe4339f439c707a0e /src/qml/jsapi/qjsengine.cpp | |
| parent | 2e4f66caa8a5f9e887dbdb4e3f2ae5c9be9a7005 (diff) | |
Fix Persistent/WeakValue API
Don't use unprotected Values in the API anymore.
Change-Id: I8851628227fca374de24701bc8ee0908b5ae3923
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsapi/qjsengine.cpp')
| -rw-r--r-- | src/qml/jsapi/qjsengine.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp index f99463256e..59a6a14e81 100644 --- a/src/qml/jsapi/qjsengine.cpp +++ b/src/qml/jsapi/qjsengine.cpp @@ -286,7 +286,9 @@ QJSValue QJSEngine::evaluate(const QString& program, const QString& fileName, in */ QJSValue QJSEngine::newObject() { - return new QJSValuePrivate(d->m_v4Engine->newObject()->getPointer()); + QV4::Scope scope(d->m_v4Engine); + QV4::ScopedValue v(scope, d->m_v4Engine->newObject()); + return new QJSValuePrivate(d->m_v4Engine, v); } /*! @@ -301,7 +303,7 @@ QJSValue QJSEngine::newArray(uint length) if (length < 0x1000) array->arrayReserve(length); array->setArrayLengthUnchecked(length); - return new QJSValuePrivate(d->m_v4Engine, array.asValue()); + return new QJSValuePrivate(d->m_v4Engine, array); } /*! @@ -346,7 +348,10 @@ QJSValue QJSEngine::newQObject(QObject *object) */ QJSValue QJSEngine::globalObject() const { - return new QJSValuePrivate(d->m_v4Engine->globalObject); + Q_D(const QJSEngine); + QV4::Scope scope(d->m_v4Engine); + QV4::ScopedValue v(scope, d->m_v4Engine->globalObject); + return new QJSValuePrivate(d->m_v4Engine, v); } /*! @@ -356,7 +361,9 @@ QJSValue QJSEngine::globalObject() const QJSValue QJSEngine::create(int type, const void *ptr) { Q_D(QJSEngine); - return new QJSValuePrivate(d->m_v4Engine, QV4::Value::fromReturnedValue(d->metaTypeToJS(type, ptr))); + QV4::Scope scope(d->m_v4Engine); + QV4::ScopedValue v(scope, d->metaTypeToJS(type, ptr)); + return new QJSValuePrivate(d->m_v4Engine, v); } /*! |