diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-02-06 19:40:36 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-02-06 19:40:36 +0000 |
| commit | 81b393227db1f28a3838ea9aa958d5e609fe0cdf (patch) | |
| tree | 71bade271de1b7fe451f2cd505145979b9c4e34d /src/quick/util/qquickanimationcontroller.cpp | |
| parent | f252b5229dc291cbf0773d2252068b0b2a6d7c9e (diff) | |
| parent | a9a9fa0c4737017aa4fc72b467eb45645d0912f0 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.10' into dev" into refs/staging/dev
Diffstat (limited to 'src/quick/util/qquickanimationcontroller.cpp')
| -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()); } |