From 7544c242cb935b5ff625e54c3facceea535c6ae5 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 11 Sep 2020 16:10:37 +0200 Subject: Revert "Remove timeStep parameter from QAnimationDrive::advanceAnimation" This reverts commit f51b690e91bb2d7c8a03c5cef42abca37d97f8bb. The commit made all animation tests in qtdeclarative on macOS flaky. Change-Id: I4ccaa879df7e2ba7e253657de01cbabc9b2c655f Reviewed-by: Volker Hilsheimer --- src/corelib/animation/qabstractanimation.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/corelib/animation/qabstractanimation.h') diff --git a/src/corelib/animation/qabstractanimation.h b/src/corelib/animation/qabstractanimation.h index 2bb1d52582..ed0a75ea1b 100644 --- a/src/corelib/animation/qabstractanimation.h +++ b/src/corelib/animation/qabstractanimation.h @@ -152,7 +152,8 @@ Q_SIGNALS: void stopped(); protected: - void advanceAnimation(); + // ### Qt6: Remove timestep argument + void advanceAnimation(qint64 timeStep = -1); virtual void start(); virtual void stop(); -- cgit v1.2.3