diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2011-11-11 13:26:50 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-14 01:52:06 +0100 |
| commit | d7e6194b7ba5c3e13d5160109e02620a237206a0 (patch) | |
| tree | 89efc0c3a631c1e644f6d543785eb821cfa20e8a /src/declarative/items/qquickcanvas.cpp | |
| parent | 2557ff5a940242b398dee65c3c79cec088164e32 (diff) | |
Don't clobber unified timer settings
Change-Id: Iee43b566180471e08d655a4d2af72e9586227532
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/declarative/items/qquickcanvas.cpp')
| -rw-r--r-- | 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 2f6821b3e1..dfdaaed22d 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; |