diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-11-11 23:30:54 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-15 00:32:59 +0100 |
| commit | b04b5b57e92af2e036ffb65e2dd7cbba4b6c3c6a (patch) | |
| tree | 96b37c08126dac0830c9037f4085719261d72b6a /src/qml/jsapi | |
| parent | ad342b052473a8ec8c693591a8a882313ccd7d62 (diff) | |
Remove the remaining uses of Returned<T>
Change-Id: I493b75365d3c6fbf6965986d73e7aa0b659ded67
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/jsapi')
| -rw-r--r-- | src/qml/jsapi/qjsvalue.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp index 47a764e641..5f76ba2c52 100644 --- a/src/qml/jsapi/qjsvalue.cpp +++ b/src/qml/jsapi/qjsvalue.cpp @@ -1091,11 +1091,14 @@ bool QJSValue::hasOwnProperty(const QString &name) const */ QObject *QJSValue::toQObject() const { - Returned<QV4::QObjectWrapper> *o = d->value.as<QV4::QObjectWrapper>(); - if (!o) + if (!d->engine) + return 0; + QV4::Scope scope(d->engine); + QV4::Scoped<QV4::QObjectWrapper> wrapper(scope, d->value); + if (!wrapper) return 0; - return o->getPointer()->object(); + return wrapper->object(); } /*! |