projects
/
konrad/qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
2557ff5
)
Don't clobber unified timer settings
author
Alan Alpert
<alan.alpert@nokia.com>
Fri, 11 Nov 2011 03:26:50 +0000 (13:26 +1000)
committer
Qt by Nokia
<qt-info@nokia.com>
Mon, 14 Nov 2011 00:52:06 +0000 (
01:52
+0100)
Change-Id: Iee43b566180471e08d655a4d2af72e9586227532
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
src/declarative/items/qquickcanvas.cpp
patch
|
blob
|
history
diff --git
a/src/declarative/items/qquickcanvas.cpp
b/src/declarative/items/qquickcanvas.cpp
index
2f6821b
..
dfdaaed
100644
(file)
--- 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;