diff options
author | Christiaan Janssen <christiaan.janssen@nokia.com> | 2012-01-11 17:50:51 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-16 12:36:46 +0100 |
commit | df6338a7b4ff43b1bb0538c44c632d122a7c3766 (patch) | |
tree | 23ba0e6833865ad6e7bb5144c78f61d8c4590acc /src/qtquick1/util/qdeclarativepropertychanges.cpp | |
parent | eca445fdf76ee59f7dae07f8833e2f00da26dd89 (diff) |
QDeclarativeExpression: storing column number in expression location
Change-Id: I2d69738158abfc76f80b1cfc0e0ccb145fda2245
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'src/qtquick1/util/qdeclarativepropertychanges.cpp')
-rw-r--r-- | src/qtquick1/util/qdeclarativepropertychanges.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qtquick1/util/qdeclarativepropertychanges.cpp b/src/qtquick1/util/qdeclarativepropertychanges.cpp index d728c25c57..61f0aac14e 100644 --- a/src/qtquick1/util/qdeclarativepropertychanges.cpp +++ b/src/qtquick1/util/qdeclarativepropertychanges.cpp @@ -340,7 +340,7 @@ void QDeclarative1PropertyChangesPrivate::decode() QDeclarativeExpression *expression = new QDeclarativeExpression(qmlContext(q), object, data.toString()); QDeclarativeData *ddata = QDeclarativeData::get(q); if (ddata && ddata->outerContext && !ddata->outerContext->url.isEmpty()) - expression->setSourceLocation(ddata->outerContext->url.toString(), ddata->lineNumber); + expression->setSourceLocation(ddata->outerContext->url.toString(), ddata->lineNumber, ddata->columnNumber); QDeclarative1ReplaceSignalHandler *handler = new QDeclarative1ReplaceSignalHandler; handler->property = prop; handler->expression = expression; @@ -349,7 +349,7 @@ void QDeclarative1PropertyChangesPrivate::decode() QDeclarativeExpression *expression = new QDeclarativeExpression(qmlContext(q), object, data.toString()); QDeclarativeData *ddata = QDeclarativeData::get(q); if (ddata && ddata->outerContext && !ddata->outerContext->url.isEmpty()) - expression->setSourceLocation(ddata->outerContext->url.toString(), ddata->lineNumber); + expression->setSourceLocation(ddata->outerContext->url.toString(), ddata->lineNumber, ddata->columnNumber); expressions << ExpressionChange(name, id, expression); } else { properties << qMakePair(name, data); @@ -483,7 +483,7 @@ QDeclarative1PropertyChanges::ActionList QDeclarative1PropertyChanges::actions() QDeclarativeBinding *newBinding = id != QDeclarativeBinding::Invalid ? QDeclarativeBinding::createBinding(id, object(), qmlContext(this), e->sourceFile(), e->lineNumber()) : 0; if (!newBinding) { newBinding = new QDeclarativeBinding(e->expression(), object(), qmlContext(this)); - newBinding->setSourceLocation(e->sourceFile(), e->lineNumber()); + newBinding->setSourceLocation(e->sourceFile(), e->lineNumber(), e->columnNumber()); } newBinding->setTarget(prop); a.toBinding = newBinding; |