Cleanup retrieval of scope and context objects

Change-Id: I9c6174181f950bc4f829727dc6acdfe82fa4e894
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

1 files changed, 13 insertions, 1 deletions

diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index 3d541e53a3..016187f488 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -720,7 +720,7 @@ Heap::Object *ExecutionEngine::newForEachIteratorObject(Object *o)
     return obj->d();
 }
 
-Heap::Object *ExecutionEngine::qmlContextObject() const
+Heap::QmlContextWrapper *ExecutionEngine::qmlContextObject() const
 {
     Heap::ExecutionContext *ctx = currentContext();
 
@@ -741,6 +741,18 @@ Heap::Object *ExecutionEngine::qmlContextObject() const
     return static_cast<Heap::QmlContext *>(ctx)->qml;
 }
 
+QObject *ExecutionEngine::qmlScopeObject() const
+{
+    return qmlContextObject()->scopeObject;
+}
+
+QQmlContextData *ExecutionEngine::callingQmlContext() const
+{
+    Heap::QmlContextWrapper *w = qmlContextObject();
+
+    return w ? w->context.contextData() : 0;
+}
+
 QVector<StackFrame> ExecutionEngine::stackTrace(int frameLimit) const
 {
     Scope scope(const_cast<ExecutionEngine *>(this));