feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Remove the lookup into including Qml files in the root scope of a JS file.

Browse Source
This commit is contained in:
Christian Kamm
2010-02-12 10:05:13 +01:00
parent 7e01c3b5bd
commit 42959f8fef
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/libs/qmljs/qmljslink.cpp
View File

@@ -54,13 +54,16 @@ void Link::scopeChainAt(Document::Ptr doc, Node *currentObject)
if (const ObjectValue *typeEnvironment = _context->typeEnvironment(doc.data()))
_context->pushScope(typeEnvironment);
} else {
// add scope chains for all components that source this document
foreach (Document::Ptr otherDoc, _docs) {
if (otherDoc->bind()->includedScripts().contains(doc->fileName()))
pushScopeChainForComponent(otherDoc, &linkedDocs);
}
// the global scope of a js file does not see the instantiating component
if (currentObject != 0) {
// add scope chains for all components that source this document
foreach (Document::Ptr otherDoc, _docs) {
if (otherDoc->bind()->includedScripts().contains(doc->fileName()))
pushScopeChainForComponent(otherDoc, &linkedDocs);
}
// ### TODO: Which type environment do scripts see?
// ### TODO: Which type environment do scripts see?
}
_context->pushScope(bind->rootObjectValue());
}