summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-11-04 04:46:11 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-11-04 04:46:11 (GMT)
commit3ba15a237e8d38e471026e4a0f49a411bd4ada41 (patch)
tree45bcc091b252f1c4a4fe5baae97983b2a5182c2f /src/declarative
parentedcdcc5a27ce853b03e91e328b5eb4764c92eda0 (diff)
parenta5e66c8c02db19a26fcb8378a1d61302ad2d2c5f (diff)
downloadQt-3ba15a237e8d38e471026e4a0f49a411bd4ada41.zip
Qt-3ba15a237e8d38e471026e4a0f49a411bd4ada41.tar.gz
Qt-3ba15a237e8d38e471026e4a0f49a411bd4ada41.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/qml/qmlmetaproperty.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp
index 8385352..f340612 100644
--- a/src/declarative/qml/qmlmetaproperty.cpp
+++ b/src/declarative/qml/qmlmetaproperty.cpp
@@ -558,6 +558,9 @@ QmlAbstractBinding *QmlMetaProperty::binding() const
Ownership of \a newBinding transfers to QML. Ownership of the return value
is assumed by the caller.
+
+ \a flags is passed through to the binding and is used for the initial update (when
+ the binding sets the intial value, it will use these flags for the write).
*/
QmlAbstractBinding *
QmlMetaProperty::setBinding(QmlAbstractBinding *newBinding, QmlMetaProperty::WriteFlags flags) const