diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
commit | c3601a8db91bc777ea859d6a796dfab6a218675e (patch) | |
tree | d2a4f6c83bec3cddcce020966cccac72be3aa04a /src/declarative/debugger/qdeclarativeenginedebugservice.cpp | |
parent | 35794301d188b731a7b596d92fc632fff58586c0 (diff) | |
parent | 149f6afe321ce59aebe4ce2f9dddd1881d0ac22b (diff) |
Merge branch 'master' into animation-refactorwip/animation-refactor
Conflicts:
tests/auto/declarative/declarative.pro
Change-Id: Ie339be2989fac553d351f3077869f1847367b504
Diffstat (limited to 'src/declarative/debugger/qdeclarativeenginedebugservice.cpp')
-rw-r--r-- | src/declarative/debugger/qdeclarativeenginedebugservice.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/declarative/debugger/qdeclarativeenginedebugservice.cpp b/src/declarative/debugger/qdeclarativeenginedebugservice.cpp index fa23bc1024..c235b55480 100644 --- a/src/declarative/debugger/qdeclarativeenginedebugservice.cpp +++ b/src/declarative/debugger/qdeclarativeenginedebugservice.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the QtDeclarative module of the Qt Toolkit. ** @@ -540,7 +540,8 @@ void QDeclarativeEngineDebugService::setBinding(int objectId, const QVariant &expression, bool isLiteralValue, QString filename, - int line) + int line, + int column) { QObject *object = objectForId(objectId); QDeclarativeContext *context = qmlContext(object); @@ -552,7 +553,7 @@ void QDeclarativeEngineDebugService::setBinding(int objectId, bool inBaseState = true; if (m_statesDelegate) { m_statesDelegate->updateBinding(context, property, expression, isLiteralValue, - filename, line, &inBaseState); + filename, line, column, &inBaseState); } if (inBaseState) { @@ -561,11 +562,11 @@ void QDeclarativeEngineDebugService::setBinding(int objectId, } else if (hasValidSignal(object, propertyName)) { QDeclarativeExpression *declarativeExpression = new QDeclarativeExpression(context, object, expression.toString()); QDeclarativePropertyPrivate::setSignalExpression(property, declarativeExpression); - declarativeExpression->setSourceLocation(filename, line); + declarativeExpression->setSourceLocation(filename, line, column); } else if (property.isProperty()) { QDeclarativeBinding *binding = new QDeclarativeBinding(expression.toString(), object, context); binding->setTarget(property); - binding->setSourceLocation(filename, line); + binding->setSourceLocation(filename, line, column); binding->setNotifyOnValueChanged(true); QDeclarativeAbstractBinding *oldBinding = QDeclarativePropertyPrivate::setBinding(property, binding); if (oldBinding) |