From 4de8eefa80cb76f5795c4c0135f96ccd6a51a647 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Wed, 2 Sep 2020 11:24:25 +0200 Subject: [PATCH] Remove default parameter from QUnifiedTimer::updateAnimationTimers After adjustments in Qt Declarative, this parameter is no longer needed. Change-Id: I4b398748277aa29edd06ac122cfa8984575abf97 Reviewed-by: Laszlo Agocs --- src/corelib/animation/qabstractanimation.cpp | 2 +- src/corelib/animation/qabstractanimation_p.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp index d1503a294c..7ccb5772d6 100644 --- a/src/corelib/animation/qabstractanimation.cpp +++ b/src/corelib/animation/qabstractanimation.cpp @@ -290,7 +290,7 @@ void QUnifiedTimer::stopAnimationDriver() driver->stop(); } -void QUnifiedTimer::updateAnimationTimers(qint64) +void QUnifiedTimer::updateAnimationTimers() { //setCurrentTime can get this called again while we're the for loop. At least with pauseAnimations if(insideTick) diff --git a/src/corelib/animation/qabstractanimation_p.h b/src/corelib/animation/qabstractanimation_p.h index 0af1925287..e59c770280 100644 --- a/src/corelib/animation/qabstractanimation_p.h +++ b/src/corelib/animation/qabstractanimation_p.h @@ -185,7 +185,7 @@ public: void restart(); void maybeUpdateAnimationsToCurrentTime(); - void updateAnimationTimers(qint64 = -1); // ### Qt 6 - remove parameter once qtdeclarative is fixed + void updateAnimationTimers(); //useful for profiling/debugging int runningAnimationCount();