aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/compiler
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2013-09-30 06:36:35 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-30 18:21:42 +0200
commitd05151d735540f22ee3af75fdc7b2848dde2fe6f (patch)
treecb4168d924a768c592fb72713522ae6caf918917 /src/qml/compiler
parent2ec852ada2a51e1da47a2ccbb93104fc7938bfc4 (diff)
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>
Diffstat (limited to 'src/qml/compiler')
-rw-r--r--src/qml/compiler/qqmlcodegenerator.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/compiler/qqmlcodegenerator.cpp b/src/qml/compiler/qqmlcodegenerator.cpp
index 6e4b5fa8c9..ca4d8ecc7b 100644
--- 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);