From 6134f2880ab2d6a09269d2bbd36ef61f059f2193 Mon Sep 17 00:00:00 2001
From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Thu, 28 Jan 2010 15:03:12 +0100
Subject: [PATCH] Always return a valid scope from Link.
---
src/libs/qmljs/qmljslink.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/libs/qmljs/qmljslink.cpp b/src/libs/qmljs/qmljslink.cpp
index 52f90e3e744..782ad1d2aa2 100644
--- a/src/libs/qmljs/qmljslink.cpp
+++ b/src/libs/qmljs/qmljslink.cpp
@@ -153,10 +153,10 @@ ObjectValue *Link::operator()(const QList<Bind *> &binds, Bind *currentBind, UiO
else if (UiObjectBinding *binding = cast<UiObjectBinding *>(currentObject))
scopeObject = currentBind->_qmlObjectBindings.value(binding);
else
- return 0;
+ return currentBind->_interp->globalObject();
if (!scopeObject)
- return 0;
+ return currentBind->_interp->globalObject();
// Build the scope chain.
currentBind->_typeEnvironment->setScope(currentBind->_idEnvironment);
--
GitLab