diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-24 13:23:45 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-24 13:23:45 +0100 |
| commit | b78db8c1e4ec16ef8dff1585d14f9375551c47df (patch) | |
| tree | f62668cea56b9a314224ab5167bc68d725960099 /src/quick/util | |
| parent | 2570b801c74832a3c83a8b56ad0f76812969e190 (diff) | |
| parent | b64a1b3078a764797cbc3e1e4a456257c32721d6 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I37bc7afea415261639b71e7b8dfc9177fdd4cb62
Diffstat (limited to 'src/quick/util')
| -rw-r--r-- | src/quick/util/qquickanimationcontroller.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/util/qquickanimationcontroller.cpp b/src/quick/util/qquickanimationcontroller.cpp index cebb0391ae..5e56460098 100644 --- a/src/quick/util/qquickanimationcontroller.cpp +++ b/src/quick/util/qquickanimationcontroller.cpp @@ -223,7 +223,7 @@ void QQuickAnimationController::updateProgress() d->animationInstance->setDisableUserControl(); d->animationInstance->start(); - QQmlAnimationTimer::unregisterAnimation(d->animationInstance); + QQmlAnimationTimer::instance()->unregisterAnimation(d->animationInstance); d->animationInstance->setCurrentTime(d->progress * d->animationInstance->duration()); } |