diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-07-09 05:36:49 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-07-09 05:36:49 (GMT) |
| commit | 74a248462ef36f7784fd0816ee08030412459930 (patch) | |
| tree | ab41c0313467be480446397a8fe5463abee83035 /src/declarative/util/qdeclarativebehavior.cpp | |
| parent | 49b828102626ba6faa38ea48d9f570283dd7fa9f (diff) | |
| parent | 31cd8c15c0fdb2f08c2652609a57413a715d1b13 (diff) | |
| download | Qt-74a248462ef36f7784fd0816ee08030412459930.zip Qt-74a248462ef36f7784fd0816ee08030412459930.tar.gz Qt-74a248462ef36f7784fd0816ee08030412459930.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/util/qdeclarativebehavior.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativebehavior.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/declarative/util/qdeclarativebehavior.cpp index 4480e75..2bb28c3 100644 --- a/src/declarative/util/qdeclarativebehavior.cpp +++ b/src/declarative/util/qdeclarativebehavior.cpp @@ -138,10 +138,6 @@ void QDeclarativeBehavior::setAnimation(QDeclarativeAbstractAnimation *animation SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)), this, SLOT(qtAnimationStateChanged(QAbstractAnimation::State,QAbstractAnimation::State))); - connect(this, - SIGNAL(qtAnimationRunningChanged(bool)), - d->animation, - SLOT(behaviorControlRunningChanged(bool))); } } @@ -150,7 +146,7 @@ void QDeclarativeBehavior::qtAnimationStateChanged(QAbstractAnimation::State new { Q_D(QDeclarativeBehavior); if (!d->blockRunningChanged) - emit qtAnimationRunningChanged(newState == QAbstractAnimation::Running); + d->animation->notifyRunningChanged(newState == QAbstractAnimation::Running); } |