diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-05 14:10:47 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-05 14:10:47 (GMT) |
| commit | 1d7d5436eea09a232187836e59d2a937a752dee4 (patch) | |
| tree | 6bd9ae61abb1467aceddc5a828fc2e65d93b2534 /src/corelib/animation/qvariantanimation.cpp | |
| parent | 791bddfcd5cc7540219835ef5d91486acd833c4b (diff) | |
| parent | fb8bb148affec842e8fa1a70616c64c7d3066ee8 (diff) | |
| download | Qt-1d7d5436eea09a232187836e59d2a937a752dee4.zip Qt-1d7d5436eea09a232187836e59d2a937a752dee4.tar.gz Qt-1d7d5436eea09a232187836e59d2a937a752dee4.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
Conflicts:
src/script/qscriptextqobject.cpp
Diffstat (limited to 'src/corelib/animation/qvariantanimation.cpp')
| -rw-r--r-- | src/corelib/animation/qvariantanimation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp index 48e5ec1..fdd98c2 100644 --- a/src/corelib/animation/qvariantanimation.cpp +++ b/src/corelib/animation/qvariantanimation.cpp @@ -267,7 +267,7 @@ void QVariantAnimationPrivate::setCurrentValueForProgress(const qreal progress) localProgress); qSwap(currentValue, ret); q->updateCurrentValue(currentValue); - if ((connectedSignals & changedSignalMask) && currentValue != ret) { + if ((connectedSignals[0] & changedSignalMask) && currentValue != ret) { //the value has changed emit q->valueChanged(currentValue); } |