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

QmlJS: Fix import cache usage with 'as' imports.

Browse Source 
Change-Id: I6c057e494f87df927adc7b83c6caf1ecc729ac65
Reviewed-on: http://codereview.qt.nokia.com/176
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
This commit is contained in:
Christian Kamm
2011-05-27 11:00:39 +02:00
parent a7f4e5fab5
commit 96cde1e9de
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -194,6 +194,10 @@ void Link::populateImportedTypes(Imports *imports, Document::Ptr doc)
foreach (const ImportInfo &info, doc->bind()->imports()) { foreach (const ImportInfo &info, doc->bind()->imports()) {
Import import = d->importCache.value(ImportCacheKey(info)); Import import = d->importCache.value(ImportCacheKey(info));
// ensure usage of the right ImportInfo, the cached import
// can have a different 'as' clause...
import.info = info;
if (!import.object) { if (!import.object) {
switch (info.type()) { switch (info.type()) {
case ImportInfo::FileImport: case ImportInfo::FileImport: