From eb5babdda9440a8a47187a3e01239ed15cd25a9d Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Mon, 25 Jul 2011 12:40:20 +1000
Subject: 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>
---
 src/declarative/qml/qdeclarativeexpression.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/declarative/qml/qdeclarativeexpression.cpp')

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*> >());
     }
-- 
cgit v1.2.3