Fix line/column in import related error messages with the new compiler

Grab the line/column from the import token, not the import id token,
as the latter is not always present in all import statements.

Change-Id: Iaa0c2f1d60422fb779fa7a6c4fd1c895fa3f777b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

diff --git a/src/qml/compiler/qqmlcodegenerator.cpp b/src/qml/compiler/qqmlcodegenerator.cpp
index 6e4b5fa..ca4d8ec 100644 (file)
--- a/src/qml/compiler/qqmlcodegenerator.cpp
+++ b/src/qml/compiler/qqmlcodegenerator.cpp
@@ -408,8 +408,8 @@ bool QQmlCodeGenerator::visit(AST::UiImport *node)
         return false;
     }
 
-    import->location.line = node->importIdToken.startLine;
-    import->location.column = node->importIdToken.startColumn;
+    import->location.line = node->importToken.startLine;
+    import->location.column = node->importToken.startColumn;
 
     import->uriIndex = registerString(uri);