2 files changed, 7 insertions, 14 deletions
diff --git a/tests/auto/testlib/selftests/watchdog/CMakeLists.txt b/tests/auto/testlib/selftests/watchdog/CMakeLists.txt
index ddd57d228b..21beab6454 100644
--- a/tests/auto/testlib/selftests/watchdog/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/watchdog/CMakeLists.txt
@@ -1,29 +1,21 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from watchdog.pro.
-
 #####################################################################
 ## watchdog Binary:
 #####################################################################
 
 qt_internal_add_executable(watchdog
-    NO_INSTALL # special case
-    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    NO_INSTALL
+    EXCEPTIONS
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     SOURCES
         tst_watchdog.cpp
     LIBRARIES
         Qt::Test
 )
 
-#### Keys ignored in scope 1:.:.:watchdog.pro:<TRUE>:
-# QT_TOOL_ENV = "checkenv"
-# checkenv.name = "QTEST_FUNCTION_TIMEOUT"
-# checkenv.value = "100"
-
 ## Scopes:
 #####################################################################
 
-# special case begin
 qt_internal_apply_testlib_coverage_options(watchdog)
-# special case end
diff --git a/tests/auto/testlib/selftests/watchdog/tst_watchdog.cpp b/tests/auto/testlib/selftests/watchdog/tst_watchdog.cpp
index dc5cde236b..2bc8853e00 100644
--- a/tests/auto/testlib/selftests/watchdog/tst_watchdog.cpp
+++ b/tests/auto/testlib/selftests/watchdog/tst_watchdog.cpp
@@ -1,8 +1,10 @@
 // Copyright (C) 2018 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QTest>
 
+using namespace std::chrono_literals;
+
 class tst_Watchdog : public QObject
 {
     Q_OBJECT
@@ -13,10 +15,9 @@ private slots:
 void tst_Watchdog::delay() const
 {
     bool ok = false;
-    const int fiveMinutes = 5 * 60 * 1000;
     // Use the same env.var as the watch-dog and add a little to it:
     const int timeout = qEnvironmentVariableIntValue("QTEST_FUNCTION_TIMEOUT", &ok);
-    QTest::qSleep(5000 + (ok && timeout > 0 ? timeout : fiveMinutes));
+    QTest::qSleep(5s + (ok && timeout > 0 ? timeout * 1ms : 5min));
     // The watchdog timer should have interrupted us by now.
     QFAIL("ERROR: this function should be interrupted.");
 }