From f51b690e91bb2d7c8a03c5cef42abca37d97f8bb Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Wed, 2 Sep 2020 10:42:47 +0200 Subject: Remove timeStep parameter from QAnimationDrive::advanceAnimation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Addresses ### Qt 6 comment, and documentation pointing out that the parameter value is ignored. It wasn't ignored in the code, but that's the kind of change we can make now. With this change, QUnifiedTimer::updateAnimationTimers is only called with -1 as the currentTick input parameter, also from Qt Declarative. Make it default, so that leaf modules can be fixed. Once that it done, the parameter can be removed completely. Change-Id: I80c57ff92f3b615b932dd73d711cf6397347efd8 Reviewed-by: Jan Arve Sæther --- .../corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp index 55ac71c8c7..e1377ab2a3 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(m_elapsed); + advanceAnimation(); m_elapsed += interval; } - advanceAnimation(m_elapsed); + advanceAnimation(); // 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