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 --- .../corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp') diff --git a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp index 5add27bbee..8a4d05ed96 100644 --- a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp +++ b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp @@ -115,10 +115,10 @@ public: static const int interval = 1000/60; qint64 until = m_elapsed + ms; while (m_elapsed < until) { - advanceAnimation(); + advanceAnimation(m_elapsed); m_elapsed += interval; } - advanceAnimation(); + advanceAnimation(m_elapsed); // This is to make sure that animations that were started with DeleteWhenStopped // will actually delete themselves within the test function. // Normally, they won't be deleted until the main event loop is processed. -- cgit v1.2.3