From 96cde1e9de2f86a2100055b6d5274c11661c83f1 Mon Sep 17 00:00:00 2001
From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Fri, 27 May 2011 11:00:39 +0200
Subject: [PATCH] QmlJS: Fix import cache usage with 'as' imports.

Change-Id: I6c057e494f87df927adc7b83c6caf1ecc729ac65
Reviewed-on: http://codereview.qt.nokia.com/176
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
---
 src/libs/qmljs/qmljslink.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/libs/qmljs/qmljslink.cpp b/src/libs/qmljs/qmljslink.cpp
index d5c883dacc9..514ca0f7407 100644
--- a/src/libs/qmljs/qmljslink.cpp
+++ b/src/libs/qmljs/qmljslink.cpp
@@ -194,6 +194,10 @@ void Link::populateImportedTypes(Imports *imports, Document::Ptr doc)
     foreach (const ImportInfo &info, doc->bind()->imports()) {
         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) {
             switch (info.type()) {
             case ImportInfo::FileImport: