aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativeexpression.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2011-07-25 12:40:20 +1000
committerQt by Nokia <qt-info@nokia.com>2011-07-25 04:43:14 +0200
commiteb5babdda9440a8a47187a3e01239ed15cd25a9d (patch)
treeccdda9707acaafdc7cbfcf64359f44c0640f26ad /src/declarative/qml/qdeclarativeexpression.cpp
parent354e285209531da86166d94ae5b0fbf749decbcd (diff)
Enter context scope
Task-number: QTBUG-20485 Change-Id: Ifc7fa998a253b01d8114d00d537faca5df5c93c9 Reviewed-on: http://codereview.qt.nokia.com/2053 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativeexpression.cpp')
-rw-r--r--src/declarative/qml/qdeclarativeexpression.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativeexpression.cpp b/src/declarative/qml/qdeclarativeexpression.cpp
index 27bd8f8147..93f1b3b96b 100644
--- a/src/declarative/qml/qdeclarativeexpression.cpp
+++ b/src/declarative/qml/qdeclarativeexpression.cpp
@@ -665,6 +665,7 @@ QVariant QDeclarativeExpressionPrivate::value(QObject *secondaryScope, bool *isU
{
v8::HandleScope handle_scope;
+ v8::Context::Scope context_scope(ep->v8engine.context());
v8::Local<v8::Value> result = v8value(secondaryScope, isUndefined);
rv = ep->v8engine.toVariant(result, qMetaTypeId<QList<QObject*> >());
}