summaryrefslogtreecommitdiffstats
path: root/src/corelib/animation/qpauseanimation.cpp
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-10-19 00:13:48 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-10-19 00:13:48 (GMT)
commit55bddd50925da27f7a106041db44c15057aac6c1 (patch)
treea5a1ca8f7867b692d0b73e252dd2b9815107425a /src/corelib/animation/qpauseanimation.cpp
parent81093ae5ba8260f5f5b79f317dd461128e76b5fd (diff)
parent1433a2c8682cb1c8f89ceaf97ad7a509ac686879 (diff)
downloadQt-55bddd50925da27f7a106041db44c15057aac6c1.zip
Qt-55bddd50925da27f7a106041db44c15057aac6c1.tar.gz
Qt-55bddd50925da27f7a106041db44c15057aac6c1.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts: configure.exe src/corelib/animation/qabstractanimation.cpp src/s60installs/qt.iby util/qlalr/cppgenerator.cpp
Diffstat (limited to 'src/corelib/animation/qpauseanimation.cpp')
-rw-r--r--src/corelib/animation/qpauseanimation.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/animation/qpauseanimation.cpp b/src/corelib/animation/qpauseanimation.cpp
index 2fd12aa..d90f001 100644
--- a/src/corelib/animation/qpauseanimation.cpp
+++ b/src/corelib/animation/qpauseanimation.cpp
@@ -75,6 +75,7 @@ class QPauseAnimationPrivate : public QAbstractAnimationPrivate
public:
QPauseAnimationPrivate() : QAbstractAnimationPrivate(), duration(0)
{
+ isPause = true;
}
int duration;