aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlcustomparser.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2014-02-19 12:54:02 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-02 11:46:09 +0100
commitfe5a3a024ac7e5f0cfa89d58c89ac705940bd5a4 (patch)
treecef9e2778d7bbfbe49466fce0b21bfb47caf60a4 /src/qml/qml/qqmlcustomparser.cpp
parentcf5c3d686d5bbb942b565ee5df6babb10ce22bc6 (diff)
[new compiler] Fix error location when id property is used in list model elements
Change-Id: Iec648d593d30117c512009dcc6ab0d50b8fc51af Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlcustomparser.cpp')
-rw-r--r--src/qml/qml/qqmlcustomparser.cpp24
1 files changed, 5 insertions, 19 deletions
diff --git a/src/qml/qml/qqmlcustomparser.cpp b/src/qml/qml/qqmlcustomparser.cpp
index e976000c9e..fc14fae275 100644
--- a/src/qml/qml/qqmlcustomparser.cpp
+++ b/src/qml/qml/qqmlcustomparser.cpp
@@ -277,29 +277,15 @@ void QQmlCustomParser::error(const QQmlCustomParserNode& node, const QString& de
}
/*!
- Reports an error in parsing \a binding, with the given \a description.
-
- An error is generated referring to the position of \a node in the source file.
-*/
-void QQmlCustomParser::error(const QV4::CompiledData::Binding *binding, const QString &description)
-{
- QQmlError error;
- error.setLine(binding->location.line);
- error.setColumn(binding->location.column);
- error.setDescription(description);
- exceptions << error;
-}
-
-/*!
- Reports an error in parsing \a object, with the given \a description.
+ Reports an error with the given \a description.
- An error is generated referring to the position of \a object in the source file.
+ An error is generated referring to the \a location in the source file.
*/
-void QQmlCustomParser::error(const QV4::CompiledData::Object *object, const QString &description)
+void QQmlCustomParser::error(const CompiledData::Location &location, const QString &description)
{
QQmlError error;
- error.setLine(object->location.line);
- error.setColumn(object->location.column);
+ error.setLine(location.line);
+ error.setColumn(location.column);
error.setDescription(description);
exceptions << error;
}