From bf3f1cc5be0aa3965117441cb06bf37ce0c6c653 Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@nokia.com>
Date: Mon, 3 Aug 2009 11:19:18 +0200
Subject: Fixed import parsing, where the importId wasn't set.

Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
---
 src/declarative/qml/parser/qmljs.g         | 2 ++
 src/declarative/qml/parser/qmljsparser.cpp | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/declarative/qml/parser/qmljs.g b/src/declarative/qml/parser/qmljs.g
index 8d153ea..0dffa99 100644
--- a/src/declarative/qml/parser/qmljs.g
+++ b/src/declarative/qml/parser/qmljs.g
@@ -606,6 +606,7 @@ case $rule_number: {
     sym(1).UiImport->versionToken = loc(2);
     sym(1).UiImport->asToken = loc(3);
     sym(1).UiImport->importIdToken = loc(4);
+    sym(1).UiImport->importId = sym(4).sval;
     sym(1).UiImport->semicolonToken = loc(5);
 } break;
 ./
@@ -616,6 +617,7 @@ UiImport: UiImportHead T_AS JsIdentifier T_SEMICOLON ;
 case $rule_number: {
     sym(1).UiImport->asToken = loc(2);
     sym(1).UiImport->importIdToken = loc(3);
+    sym(1).UiImport->importId = sym(3).sval;
     sym(1).UiImport->semicolonToken = loc(4);
 } break;
 ./
diff --git a/src/declarative/qml/parser/qmljsparser.cpp b/src/declarative/qml/parser/qmljsparser.cpp
index 2ee0f88..1386a21 100644
--- a/src/declarative/qml/parser/qmljsparser.cpp
+++ b/src/declarative/qml/parser/qmljsparser.cpp
@@ -241,12 +241,14 @@ case 14: {
     sym(1).UiImport->versionToken = loc(2);
     sym(1).UiImport->asToken = loc(3);
     sym(1).UiImport->importIdToken = loc(4);
+    sym(1).UiImport->importId = sym(4).sval;
     sym(1).UiImport->semicolonToken = loc(5);
 } break;
 
 case 16: {
     sym(1).UiImport->asToken = loc(2);
     sym(1).UiImport->importIdToken = loc(3);
+    sym(1).UiImport->importId = sym(3).sval;
     sym(1).UiImport->semicolonToken = loc(4);
 } break;
 
-- 
cgit v0.12