summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlscriptparser.cpp
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-07-14 04:24:56 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-07-14 04:24:56 (GMT)
commita093c5ef65aa2c28f52f78c8be5bbe7d567646fa (patch)
treedd8f8774eb3e92ec49ee31abd15e4ea2e2bbcb29 /src/declarative/qml/qmlscriptparser.cpp
parent4ca1f77ab54f1e02045dc7e680bd99103f680fea (diff)
downloadQt-a093c5ef65aa2c28f52f78c8be5bbe7d567646fa.zip
Qt-a093c5ef65aa2c28f52f78c8be5bbe7d567646fa.tar.gz
Qt-a093c5ef65aa2c28f52f78c8be5bbe7d567646fa.tar.bz2
Libraries and library versioning.
Diffstat (limited to 'src/declarative/qml/qmlscriptparser.cpp')
-rw-r--r--src/declarative/qml/qmlscriptparser.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/declarative/qml/qmlscriptparser.cpp b/src/declarative/qml/qmlscriptparser.cpp
index cf4691f..f26266b 100644
--- a/src/declarative/qml/qmlscriptparser.cpp
+++ b/src/declarative/qml/qmlscriptparser.cpp
@@ -477,13 +477,12 @@ 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;
- // XXX not parsed yet...
- import.version_major = 0;
- import.version_minor = 0;
_parser->_imports << import;