Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

Conflicts:
	src/declarative/qml/qmlscriptparser.cpp
	src/declarative/qml/qmlscriptparser_p.h

Compiles, but probably next needs a revert/change of module stuff,
since that work seems to have been duplicated.

1 files changed, 6 insertions, 2 deletions

diff --git a/src/declarative/qml/qmlscriptparser_p.h b/src/declarative/qml/qmlscriptparser_p.h
index 05e70a5..065c1c0 100644
--- a/src/declarative/qml/qmlscriptparser_p.h
+++ b/src/declarative/qml/qmlscriptparser_p.h
@@ -72,12 +72,16 @@ public:
     class Import
     {
     public:
-        Import() : version_major(0), version_minor(0) {}
+        Import() : type(Library), version_major(0), version_minor(0) {}
+
+        enum Type { Library, File };
+        Type type;
 
         QString uri;
-        QString prefix;
+        QString as; // prefix for qualification
         int version_major;
         int version_minor;
+
         QmlParser::LocationSpan location;
     };