summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2010-03-08 05:56:31 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2010-03-08 05:56:31 (GMT)
commitac764b3d0e7b7b591481da5f4da821bc27400817 (patch)
tree5785e5dfc4eb2f0aec347fe766febf86a3f2b740
parent03a2ed58778d500cc7eed285478d0e304b3c92dc (diff)
downloadQt-ac764b3d0e7b7b591481da5f4da821bc27400817.zip
Qt-ac764b3d0e7b7b591481da5f4da821bc27400817.tar.gz
Qt-ac764b3d0e7b7b591481da5f4da821bc27400817.tar.bz2
Make the animation property of Behavior deferred.
-rw-r--r--src/declarative/util/qdeclarativebehavior.cpp1
-rw-r--r--src/declarative/util/qdeclarativebehavior_p.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/declarative/util/qdeclarativebehavior.cpp
index dea2c02..d90ca33 100644
--- a/src/declarative/util/qdeclarativebehavior.cpp
+++ b/src/declarative/util/qdeclarativebehavior.cpp
@@ -157,6 +157,7 @@ void QDeclarativeBehavior::setEnabled(bool enabled)
void QDeclarativeBehavior::write(const QVariant &value)
{
Q_D(QDeclarativeBehavior);
+ qmlExecuteDeferred(this);
if (!d->animation || !d->enabled) {
QDeclarativePropertyPrivate::write(d->property, value, QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding);
return;
diff --git a/src/declarative/util/qdeclarativebehavior_p.h b/src/declarative/util/qdeclarativebehavior_p.h
index a633b55..ff58210 100644
--- a/src/declarative/util/qdeclarativebehavior_p.h
+++ b/src/declarative/util/qdeclarativebehavior_p.h
@@ -65,6 +65,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeBehavior : public QObject, public QDeclar
Q_CLASSINFO("DefaultProperty", "animation")
Q_PROPERTY(QDeclarativeAbstractAnimation *animation READ animation WRITE setAnimation)
Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
+ Q_CLASSINFO("DeferredPropertyNames", "animation")
public:
QDeclarativeBehavior(QObject *parent=0);