diff options
| author | Christian Kamm <[email protected]> | 2011-05-27 10:43:06 +0200 |
|---|---|---|
| committer | Christian Kamm <[email protected]> | 2011-05-27 11:48:53 +0200 |
| commit | a7f4e5fab5f46ec392345770c017de2106f9615a (patch) | |
| tree | 7b0ee292275ae7c8b757b61478476c529aaa98bf /src/libs/qmljs/qmljsscopebuilder.cpp | |
| parent | ca1eaca136c8944b618fd58835dd0bd213b68d77 (diff) | |
QmlJS: Separate imported types and imported JS scopes.
Task-number: QTCREATORBUG-4981
Change-Id: I06d3e428ca4928296a3d5977aeff29fc3217c37c
Reviewed-on: http://codereview.qt.nokia.com/175
Reviewed-by: Fawzi Mohamed <[email protected]>
Diffstat (limited to 'src/libs/qmljs/qmljsscopebuilder.cpp')
| -rw-r--r-- | src/libs/qmljs/qmljsscopebuilder.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libs/qmljs/qmljsscopebuilder.cpp b/src/libs/qmljs/qmljsscopebuilder.cpp index 62f43c1e5c2..5fb853aa0a2 100644 --- a/src/libs/qmljs/qmljsscopebuilder.cpp +++ b/src/libs/qmljs/qmljsscopebuilder.cpp @@ -127,8 +127,9 @@ void ScopeBuilder::initializeRootScope() componentScopes.insert(_doc.data(), chain); makeComponentChain(_doc, snapshot, chain, &componentScopes); - if (const TypeEnvironment *typeEnvironment = _context->typeEnvironment(_doc.data())) { - scopeChain.qmlTypes = typeEnvironment; + if (const Imports *imports = _context->imports(_doc.data())) { + scopeChain.qmlTypes = imports->typeScope(); + scopeChain.jsImports = imports->jsImportScope(); } } else { // add scope chains for all components that import this file |