diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-03-22 23:26:17 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-03-22 23:26:17 (GMT) |
| commit | 190b2667b54eff4540e6b204d0cda39847417a52 (patch) | |
| tree | 70e85a7e650c4ac3e8f8dae9bd9c4bf32fd355b3 /src/declarative/qml/parser/qdeclarativejs.g | |
| parent | 2b098cd37d86bc7c843225412c90948affb8fef1 (diff) | |
| download | Qt-190b2667b54eff4540e6b204d0cda39847417a52.zip Qt-190b2667b54eff4540e6b204d0cda39847417a52.tar.gz Qt-190b2667b54eff4540e6b204d0cda39847417a52.tar.bz2 | |
Manual merge.
Diffstat (limited to 'src/declarative/qml/parser/qdeclarativejs.g')
| -rw-r--r-- | src/declarative/qml/parser/qdeclarativejs.g | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/qml/parser/qdeclarativejs.g b/src/declarative/qml/parser/qdeclarativejs.g index 493ad25..0256c52 100644 --- a/src/declarative/qml/parser/qdeclarativejs.g +++ b/src/declarative/qml/parser/qdeclarativejs.g @@ -665,7 +665,9 @@ case $rule_number: { sym(1).Node = node; - if (! node) { + if (node) { + node->importToken = loc(1); + } else { diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, loc(1), QLatin1String("Expected a qualified name id or a string literal"))); |