From d7e6194b7ba5c3e13d5160109e02620a237206a0 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Fri, 11 Nov 2011 13:26:50 +1000
Subject: [PATCH] Don't clobber unified timer settings

Change-Id: Iee43b566180471e08d655a4d2af72e9586227532
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
---
 src/declarative/items/qquickcanvas.cpp |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/declarative/items/qquickcanvas.cpp b/src/declarative/items/qquickcanvas.cpp
index 2f6821b..dfdaaed 100644
--- a/src/declarative/items/qquickcanvas.cpp
+++ b/src/declarative/items/qquickcanvas.cpp
@@ -488,7 +488,9 @@ QQuickCanvasPrivate::~QQuickCanvasPrivate()
 
 void QQuickCanvasPrivate::init(QQuickCanvas *c)
 {
-    QUnifiedTimer::instance(true)->setConsistentTiming(qmlFixedAnimationStep());
+    QUnifiedTimer* ut = QUnifiedTimer::instance(true);
+    if (qmlFixedAnimationStep())
+        ut->setConsistentTiming(true);
 
     q_ptr = c;
 
-- 
1.7.2.5