summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativeenginedebug.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-07-16 10:44:09 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-07-16 10:44:09 (GMT)
commit636698a5f97401a9aeb18cd690d7f08b05dcd5e6 (patch)
tree65050b764e1aeb3f002cd929ce443cb26ff98a2a /src/declarative/qml/qdeclarativeenginedebug.cpp
parent8d8566d061e26f18e1bde1255fdc1375035c8eaa (diff)
parent975b1913e44128a3e9b9055f9bf2ff40d86adf2a (diff)
downloadQt-636698a5f97401a9aeb18cd690d7f08b05dcd5e6.zip
Qt-636698a5f97401a9aeb18cd690d7f08b05dcd5e6.tar.gz
Qt-636698a5f97401a9aeb18cd690d7f08b05dcd5e6.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix RightBearing confusion in text layout fixes, improvements for various docs and example code Fixed debugger's evaluation of dynamic properties in context Allow test to pass on smaller screens (eg. 480 high). Minor animation doc improvement
Diffstat (limited to 'src/declarative/qml/qdeclarativeenginedebug.cpp')
-rw-r--r--src/declarative/qml/qdeclarativeenginedebug.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeenginedebug.cpp b/src/declarative/qml/qdeclarativeenginedebug.cpp
index 001da46..008d054 100644
--- a/src/declarative/qml/qdeclarativeenginedebug.cpp
+++ b/src/declarative/qml/qdeclarativeenginedebug.cpp
@@ -495,7 +495,7 @@ void QDeclarativeEngineDebugServer::setBinding(int objectId,
QDeclarativePropertyPrivate::setSignalExpression(property, declarativeExpression);
} else {
QDeclarativeBinding *binding = new QDeclarativeBinding(expression.toString(), object, context);
- QDeclarativeProperty property(object, propertyName);
+ QDeclarativeProperty property(object, propertyName, context);
binding->setTarget(property);
binding->setNotifyOnValueChanged(true);
QDeclarativeAbstractBinding *oldBinding = QDeclarativePropertyPrivate::setBinding(property, binding);