diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-03 03:00:41 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-03 03:00:41 (GMT) |
| commit | 59e78ceb3b29b2dadad2b510bb58c9dd43f09e19 (patch) | |
| tree | 41ac8057870dd98aa63ac4b161bb5ba4f86c800d /src/declarative | |
| parent | fa23a63af230f0c917cc56e6c652c01e6695ef63 (diff) | |
| parent | c9e07d69ec084a75fc083baecd46d0b8b422d1c4 (diff) | |
| download | Qt-59e78ceb3b29b2dadad2b510bb58c9dd43f09e19.zip Qt-59e78ceb3b29b2dadad2b510bb58c9dd43f09e19.tar.gz Qt-59e78ceb3b29b2dadad2b510bb58c9dd43f09e19.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/util/qdeclarativeanimation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp index ebf1a20..7f4f1c0 100644 --- a/src/declarative/util/qdeclarativeanimation.cpp +++ b/src/declarative/util/qdeclarativeanimation.cpp @@ -2225,7 +2225,7 @@ struct PropertyUpdater : public QDeclarativeBulkValueUpdater bool fromSourced; bool fromDefined; bool *wasDeleted; - PropertyUpdater() : wasDeleted(0) {} + PropertyUpdater() : prevInterpolatorType(0), wasDeleted(0) {} ~PropertyUpdater() { if (wasDeleted) *wasDeleted = true; } void setValue(qreal v) { |