diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-08-04 03:42:40 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-08-04 03:42:40 (GMT) |
| commit | 52aa98b54fd663a563d5fb4adc6230dbbbe9f311 (patch) | |
| tree | 13d9f60b9aec3f0b7500adc6214c3df1a097624f /src/declarative/qml/parser | |
| parent | 588093b3e12dd5039bcc4ee545d9d9112d25394f (diff) | |
| parent | bf3f1cc5be0aa3965117441cb06bf37ce0c6c653 (diff) | |
| download | Qt-52aa98b54fd663a563d5fb4adc6230dbbbe9f311.zip Qt-52aa98b54fd663a563d5fb4adc6230dbbbe9f311.tar.gz Qt-52aa98b54fd663a563d5fb4adc6230dbbbe9f311.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/parser')
| -rw-r--r-- | src/declarative/qml/parser/qmljs.g | 2 | ||||
| -rw-r--r-- | src/declarative/qml/parser/qmljsparser.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
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; |