summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlbinding.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/declarative/qml/qmlbinding.cpp')
-rw-r--r--src/declarative/qml/qmlbinding.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/declarative/qml/qmlbinding.cpp b/src/declarative/qml/qmlbinding.cpp
index 58ce02c..2435c40 100644
--- a/src/declarative/qml/qmlbinding.cpp
+++ b/src/declarative/qml/qmlbinding.cpp
@@ -97,7 +97,7 @@ QmlMetaProperty QmlBinding::property() const
return d->bindingData()->property;
}
-void QmlBinding::update()
+void QmlBinding::update(QmlMetaProperty::WriteFlags flags)
{
Q_D(QmlBinding);
@@ -119,17 +119,17 @@ void QmlBinding::update()
int idx = data->property.coreIndex();
Q_ASSERT(idx != -1);
- void *a[1];
+
QmlBinding *t = this;
- a[0] = (void *)&t;
- QMetaObject::metacall(data->property.object(),
+ int status = -1;
+ void *a[] = { &t, 0, &status, &flags };
+ QMetaObject::metacall(data->property.object(),
QMetaObject::WriteProperty,
idx, a);
} else {
-
QVariant value = this->value();
- data->property.write(value, QmlMetaProperty::Binding);
+ data->property.write(value, flags);
}
data->updating = false;
@@ -146,17 +146,17 @@ void QmlBinding::valueChanged()
update();
}
-void QmlBinding::setEnabled(bool e)
+void QmlBinding::setEnabled(bool e, QmlMetaProperty::WriteFlags flags)
{
Q_D(QmlBinding);
d->bindingData()->enabled = e;
setTrackChange(e);
- QmlAbstractBinding::setEnabled(e);
+ QmlAbstractBinding::setEnabled(e, flags);
if (e) {
addToObject(d->bindingData()->property.object());
- update();
+ update(flags);
} else {
removeFromObject();
}
@@ -231,7 +231,7 @@ QString QmlAbstractBinding::expression() const
return QLatin1String("<Unknown>");
}
-void QmlAbstractBinding::setEnabled(bool e)
+void QmlAbstractBinding::setEnabled(bool e, QmlMetaProperty::WriteFlags)
{
if (e) m_mePtr = 0;
}