1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QTest::qWaitFor(., int): restore lost Qt::PreciseTimer'ness

Browse Source 
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 <thiago.macieira@intel.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 73c52ba2687c2035a40141f2a5236399f8331f4b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2024-03-08 13:20:29 +01:00 committed by Qt Cherry-pick Bot
parent 651c0fd223
commit d9da7c9362
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/kernel/qtestsupport_core.h
View File

@ -62,7 +62,7 @@ qWaitFor(Functor predicate, QDeadlineTimer deadline = QDeadlineTimer(std::chrono
template <typename Functor> template <typename Functor>
[[nodiscard]] static bool qWaitFor(Functor predicate, int timeout) [[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); Q_CORE_EXPORT void qWait(int ms);