From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Mon, 25 Jul 2011 02:40:20 +0000 (+1000)
Subject: Enter context scope
X-Git-Tag: qt-v5.0.0-alpha1~2103
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eb5babdda9440a8a47187a3e01239ed15cd25a9d;p=profile%2Fivi%2Fqtdeclarative.git

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>
---

diff --git a/src/declarative/qml/qdeclarativeexpression.cpp b/src/declarative/qml/qdeclarativeexpression.cpp
index 27bd8f8..93f1b3b 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*> >());
     }