From b8966021ffb2cfddc77aee6dbe145eb74ef22f9d Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 28 Feb 2023 09:58:12 +0100 Subject: [PATCH] tst_QMutex: use constexpr variables instead of 'enum-trick' C++20 doesn't like arithmetic with enums anymore. While this hasn't caused immediate pain, yet, fix it pro-actively for an imminent patch. As a drive-by, fix the missing space at start of comment. Pick-to: 6.5 6.4 6.4.3 6.2 Change-Id: Id08bb227c587bc7b900c593a7b6d2655ca32eefd Reviewed-by: Thiago Macieira --- tests/auto/corelib/thread/qmutex/tst_qmutex.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp b/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp index c03c0c0969..e4f98608ae 100644 --- a/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp +++ b/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp @@ -1038,8 +1038,8 @@ void tst_QMutex::lock_unlock_locked_tryLock() } } -enum { one_minute = 6 * 1000, //not really one minute, but else it is too long. - threadCount = 10 }; +constexpr int one_minute = 6 * 1000; // not really one minute, but else it is too long. +constexpr int threadCount = 10; class StressTestThread : public QThread {