1 files changed, 3 insertions, 13 deletions
diff --git a/src/declarative/qml/qmlscriptparser.cpp b/src/declarative/qml/qmlscriptparser.cpp
index d1ad540..f26266b 100644
--- a/src/declarative/qml/qmlscriptparser.cpp
+++ b/src/declarative/qml/qmlscriptparser.cpp
@@ -468,7 +468,6 @@ bool ProcessAST::visit(AST::UiImport *node)
     if (node->fileName) {
         import.type = QmlScriptParser::Import::File;
         uri = node->fileName->asString();
-        _parser->addNamespacePath(uri);
     } else {
         import.type = QmlScriptParser::Import::Library;
         uri = asString(node->importUri);
@@ -478,7 +477,9 @@ bool ProcessAST::visit(AST::UiImport *node)
     AST::SourceLocation endLoc = node->semicolonToken;
 
     if (node->importId)
-        import.as = node->importId->asString();
+        import.qualifier = node->importId->asString();
+    if (node->versionToken.isValid())
+        import.version = textAt(node->versionToken);
 
     import.location = location(startLoc, endLoc);
     import.uri = uri;
@@ -852,11 +853,6 @@ bool QmlScriptParser::parse(const QByteArray &qmldata, const QUrl &url)
     return _errors.isEmpty();
 }
 
-QMap<QString,QString> QmlScriptParser::nameSpacePaths() const
-{
-    return _nameSpacePaths;
-}
-
 QStringList QmlScriptParser::types() const
 {
     return _typeNames;
@@ -883,7 +879,6 @@ void QmlScriptParser::clear()
         root->release();
         root = 0;
     }
-    _nameSpacePaths.clear();
     _typeNames.clear();
     _errors.clear();
 
@@ -912,9 +907,4 @@ void QmlScriptParser::setTree(Object *tree)
     root = tree;
 }
 
-void QmlScriptParser::addNamespacePath(const QString &path)
-{
-    _nameSpacePaths.insertMulti(QString(), path);
-}
-
 QT_END_NAMESPACE