diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-02-25 11:51:57 +0100 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-02-25 11:51:57 +0100 |
| commit | 0a022996bd138553360562444d8b85a6141ab0ae (patch) | |
| tree | 664c1239a58c4136940e662ddd5a173a40d0b26d /src/corelib/animation | |
| parent | 53ab13a1a403ebe7e7c4c59ce9f605bacf3e2b18 (diff) | |
| parent | 52211876f610cf81c47f32bda6a271d9e9875bff (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team
Diffstat (limited to 'src/corelib/animation')
| -rw-r--r-- | src/corelib/animation/qabstractanimation.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp index 08a17a2b67..2d5cfabe2f 100644 --- a/src/corelib/animation/qabstractanimation.cpp +++ b/src/corelib/animation/qabstractanimation.cpp @@ -501,6 +501,7 @@ QDefaultAnimationDriver::QDefaultAnimationDriver(QUnifiedTimer *timer) void QDefaultAnimationDriver::timerEvent(QTimerEvent *e) { Q_ASSERT(e->timerId() == m_timer.timerId()); + Q_UNUSED(e); // if the assertions are disabled advance(); } |