summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2024-03-08 13:20:29 +0100
committerMarc Mutz <marc.mutz@qt.io>2024-03-13 11:23:52 +0100
commit73c52ba2687c2035a40141f2a5236399f8331f4b (patch)
tree97255253e7fb3ed1732be9a9a0e952e8f5cb69a9 /src/corelib/kernel
parent097f0edc9ff2a53c55395a5ef9dd20f7763d84b5 (diff)
QTest::qWaitFor(., int): restore lost Qt::PreciseTimer'ness
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 6.7.0 Change-Id: Ib8e5b912c74b70d32a77195edb0d2a30cd7c241d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r--src/corelib/kernel/qtestsupport_core.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qtestsupport_core.h b/src/corelib/kernel/qtestsupport_core.h
index c5e3858ea8..1507c94783 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 <typename Functor>
[[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);