diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2010-01-28 15:03:12 +0100 |
|---|---|---|
| committer | Christian Kamm <christian.d.kamm@nokia.com> | 2010-01-28 15:03:50 +0100 |
| commit | 6134f2880ab2d6a09269d2bbd36ef61f059f2193 (patch) | |
| tree | 09d9bc794bf145fd43c8428846c98bcc30b4f4f2 /src | |
| parent | 7bc2ab8ac96d25adc49ba8bf24eeec331825736f (diff) | |
| download | qt-creator-6134f2880ab2d6a09269d2bbd36ef61f059f2193.tar.gz | |
Always return a valid scope from Link.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/qmljs/qmljslink.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/qmljs/qmljslink.cpp b/src/libs/qmljs/qmljslink.cpp index 52f90e3e74..782ad1d2aa 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); |