diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-06-04 16:35:00 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2013-06-05 10:55:08 +0200 |
| commit | f0e32d311a791910acef672b1ab9a2ac4a80171e (patch) | |
| tree | b4af025e391eb84e8a5ec7e6ec550e35aeac5488 /src/qml/qml/qqmljavascriptexpression.cpp | |
| parent | c0a79111f7c08b482338df05e047da1ddbf95c9b (diff) | |
Move QV8QObjectWrapper::newQObject into QV4::QObjectWrapper
...where it is just called wrap(), because it doesn't always create a new
JS wrapper for the QObject.
Change-Id: Ieed0fc97174eb51cd04df0149e715c234a5822bd
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmljavascriptexpression.cpp')
| -rw-r--r-- | src/qml/qml/qqmljavascriptexpression.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp index 863432bcc0..6670948efb 100644 --- a/src/qml/qml/qqmljavascriptexpression.cpp +++ b/src/qml/qml/qqmljavascriptexpression.cpp @@ -160,7 +160,7 @@ QQmlJavaScriptExpression::evaluate(QQmlContextData *context, try { QV4::Value This = ep->v8engine()->global(); if (scopeObject() && requiresThisObject()) { - QV4::Value value = ep->v8engine()->newQObject(scopeObject()); + QV4::Value value = QV4::QObjectWrapper::wrap(ctx->engine, scopeObject()); if (value.isObject()) This = value; } |