diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2010-03-08 06:57:58 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2010-03-08 06:57:58 (GMT) |
| commit | bf6541626332d55f9521ee601f2eb71f7cd86c3d (patch) | |
| tree | 52e8d2d9762f3434a5eaef7def5460ccac9e17c1 | |
| parent | 4bd0dc0b6c07ff288c77f547792a62d5e8ad7356 (diff) | |
| parent | ac764b3d0e7b7b591481da5f4da821bc27400817 (diff) | |
| download | Qt-bf6541626332d55f9521ee601f2eb71f7cd86c3d.zip Qt-bf6541626332d55f9521ee601f2eb71f7cd86c3d.tar.gz Qt-bf6541626332d55f9521ee601f2eb71f7cd86c3d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
| -rw-r--r-- | src/declarative/util/qdeclarativebehavior.cpp | 1 | ||||
| -rw-r--r-- | src/declarative/util/qdeclarativebehavior_p.h | 1 |
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); |