summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qdeclarativepropertychanges.cpp
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2010-05-12 00:36:34 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2010-05-12 01:53:01 (GMT)
commitf303375383ff405afbbe78ec2c951f2e24a121be (patch)
treef7d1869e04d393b96d05a514c9fd98118e91157d /src/declarative/util/qdeclarativepropertychanges.cpp
parent34f9f08dd290710512fb7dc8a4d473b6e08c84b4 (diff)
downloadQt-f303375383ff405afbbe78ec2c951f2e24a121be.zip
Qt-f303375383ff405afbbe78ec2c951f2e24a121be.tar.gz
Qt-f303375383ff405afbbe78ec2c951f2e24a121be.tar.bz2
Apply signal handler changes immediately.
Fix regression in bindinganimation visual test introduced in 129940723d9145a4380f7e44c06cbaa88ee4053b.
Diffstat (limited to 'src/declarative/util/qdeclarativepropertychanges.cpp')
-rw-r--r--src/declarative/util/qdeclarativepropertychanges.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp
index 94780c4..a22c756 100644
--- a/src/declarative/util/qdeclarativepropertychanges.cpp
+++ b/src/declarative/util/qdeclarativepropertychanges.cpp
@@ -161,20 +161,15 @@ public:
QDeclarativeExpression *rewindExpression;
QDeclarativeGuard<QDeclarativeExpression> ownedExpression;
- virtual bool changesBindings() { return true; }
- virtual void clearBindings() {
- ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, 0);
- }
-
virtual void execute(Reason) {
- QDeclarativePropertyPrivate::setSignalExpression(property, expression);
+ ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, expression);
if (ownedExpression == expression)
ownedExpression = 0;
}
virtual bool isReversable() { return true; }
virtual void reverse(Reason) {
- QDeclarativePropertyPrivate::setSignalExpression(property, reverseExpression);
+ ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, reverseExpression);
if (ownedExpression == reverseExpression)
ownedExpression = 0;
}
@@ -198,7 +193,7 @@ public:
}
virtual void rewind() {
- QDeclarativePropertyPrivate::setSignalExpression(property, rewindExpression);
+ ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, rewindExpression);
if (ownedExpression == rewindExpression)
ownedExpression = 0;
}