From d9da7c9362363e32d732370d5f340119d6fe9dd5 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 8 Mar 2024 13:20:29 +0100 Subject: [PATCH] QTest::qWaitFor(., int): restore lost Qt::PreciseTimer'ness MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Before the qWaitFor() port from int to QDeadlineTimer, the implementation constructed a QDeadlineTimer internally, passing int timeout and Qt::PreciseTimer. The int overload that was retained for source-compatibility, however, constructs the QDeadlineTimer without the PreciseTimer flag, which is a behavior change. Restore the Qt 6.6 behavior and pass Qt::PreciseTimer. Amends fa296ee1dcf4c16fb6f242cf08949485e499fec3. Pick-to: 6.7.0 Change-Id: Ib8e5b912c74b70d32a77195edb0d2a30cd7c241d Reviewed-by: Thiago Macieira Reviewed-by: Tor Arne Vestbø (cherry picked from commit 73c52ba2687c2035a40141f2a5236399f8331f4b) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/kernel/qtestsupport_core.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/kernel/qtestsupport_core.h b/src/corelib/kernel/qtestsupport_core.h index c5e3858ea85..1507c94783d 100644 --- a/src/corelib/kernel/qtestsupport_core.h +++ b/src/corelib/kernel/qtestsupport_core.h @@ -62,7 +62,7 @@ qWaitFor(Functor predicate, QDeadlineTimer deadline = QDeadlineTimer(std::chrono template [[nodiscard]] static bool qWaitFor(Functor predicate, int timeout) { - return qWaitFor(predicate, QDeadlineTimer(timeout)); + return qWaitFor(predicate, QDeadlineTimer{timeout, Qt::PreciseTimer}); } Q_CORE_EXPORT void qWait(int ms);