Fixed QUnifiedTimer cleanup.

When destroying QUnifiedTimer's instance, its default animation
driver is destroyed as well. This patch avoids creating another
QUnifiedTimer instance when the animation driver's destructor
calls QUnifiedTimer::instance().

Change-Id: I9cf254a9d04d79447baa8f27625c3890c3645f08
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>

diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp
index 830c5da..b529359 100644 (file)
--- a/src/corelib/animation/qabstractanimation.cpp
+++ b/src/corelib/animation/qabstractanimation.cpp
@@ -466,8 +466,8 @@ QAnimationDriver::QAnimationDriver(QAnimationDriverPrivate &dd, QObject *parent)
 
 QAnimationDriver::~QAnimationDriver()
 {
-    QUnifiedTimer *timer = QUnifiedTimer::instance(true);
-    if (timer->canUninstallAnimationDriver(this))
+    QUnifiedTimer *timer = QUnifiedTimer::instance(false);
+    if (timer && timer->canUninstallAnimationDriver(this))
         uninstall();
 }