4 files changed, 20 insertions, 37 deletions
diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h
index c749cbd492f..431f91d5474 100644
--- a/src/testlib/qtest.h
+++ b/src/testlib/qtest.h
@@ -181,29 +181,17 @@ inline bool qCompare(quint32 const &t1, quint64 const &t2, const char *actual,
 }
 namespace Internal {
 
-template <typename T>
-class HasInitMain // SFINAE test for the presence of initMain()
-{
-private:
-    using YesType = char[1];
-    using NoType = char[2];
-
-    template <typename C> static YesType& test( decltype(&C::initMain) ) ;
-    template <typename C> static NoType& test(...);
-
-public:
-    enum { value = sizeof(test<T>(nullptr)) == sizeof(YesType) };
-};
+template <typename T, typename = void>
+struct HasInitMain : std::false_type{};
 
-template<typename T>
-typename std::enable_if<HasInitMain<T>::value, void>::type callInitMain()
-{
-    T::initMain();
-}
+template <typename T>
+struct HasInitMain<T, std::void_t<decltype(&T::initMain)>> : std::true_type {};
 
 template<typename T>
-typename std::enable_if<!HasInitMain<T>::value, void>::type callInitMain()
+void callInitMain()
 {
+    if constexpr (HasInitMain<T>::value)
+        T::initMain();
 }
 
 } // namespace Internal
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 6c7e71294ed..a98f5da2389 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -393,6 +393,7 @@ static QString mainSourcePath;
 static bool inTestFunction = false;
 
 #if defined(Q_OS_MACOS)
+static std::optional<QTestPrivate::AppNapDisabler> appNapDisabler;
 static IOPMAssertionID macPowerSavingDisabled = 0;
 #endif
 
@@ -409,7 +410,7 @@ public:
     static QMetaMethod findMethod(const QObject *obj, const char *signature);
 
 private:
-    bool invokeTest(int index, QLatin1StringView tag, std::optional<WatchDog> &watchDog) const;
+    void invokeTest(int index, QLatin1StringView tag, std::optional<WatchDog> &watchDog) const;
     void invokeTestOnData(int index) const;
 
     QMetaMethod m_initTestCaseMethod; // might not exist, check isValid().
@@ -1314,11 +1315,8 @@ static void printUnknownDataTagError(QLatin1StringView name, QLatin1StringView t
 
     Call slot_data(), init(), slot(), cleanup(), init(), slot(), cleanup(), ...
     If data is set then it is the only test that is performed
-
-    If the function was successfully called, true is returned, otherwise
-    false.
 */
-bool TestMethods::invokeTest(int index, QLatin1StringView tag, std::optional<WatchDog> &watchDog) const
+void TestMethods::invokeTest(int index, QLatin1StringView tag, std::optional<WatchDog> &watchDog) const
 {
     QBenchmarkTestMethodData benchmarkData;
     QBenchmarkTestMethodData::current = &benchmarkData;
@@ -1421,8 +1419,6 @@ bool TestMethods::invokeTest(int index, QLatin1StringView tag, std::optional<Wat
     QTestResult::finishedCurrentTestFunction();
     QTestResult::setSkipCurrentTest(false);
     QTestResult::setBlacklistCurrentTest(false);
-
-    return true;
 }
 
 void *fetchData(QTestData *data, const char *tagName, int typeId)
@@ -1742,10 +1738,8 @@ void TestMethods::invokeTests(QObject *testObject) const
                 const char *data = nullptr;
                 if (i < QTest::testTags.size() && !QTest::testTags.at(i).isEmpty())
                     data = qstrdup(QTest::testTags.at(i).toLatin1().constData());
-                const bool ok = invokeTest(i, QLatin1StringView(data), watchDog);
+                invokeTest(i, QLatin1StringView(data), watchDog);
                 delete [] data;
-                if (!ok)
-                    break;
             }
         }
 
@@ -1881,13 +1875,12 @@ void QTest::qInit(QObject *testObject, int argc, char **argv)
     QTestPrivate::disableWindowRestore();
 
     // Disable App Nap which may cause tests to stall
-    QTestPrivate::AppNapDisabler appNapDisabler;
+    if (!appNapDisabler)
+        appNapDisabler.emplace();
 
-    if (qApp && (qstrcmp(qApp->metaObject()->className(), "QApplication") == 0)) {
-        IOPMAssertionCreateWithName(kIOPMAssertionTypeNoDisplaySleep,
-            kIOPMAssertionLevelOn, CFSTR("QtTest running tests"),
-            &macPowerSavingDisabled);
-    }
+    IOPMAssertionCreateWithName(kIOPMAssertionTypeNoDisplaySleep,
+                                kIOPMAssertionLevelOn, CFSTR("QtTest running tests"),
+                                &macPowerSavingDisabled);
 #endif
 
     QTestPrivate::parseBlackList();
@@ -2041,6 +2034,7 @@ void QTest::qCleanup()
 
 #if defined(Q_OS_MACOS)
     IOPMAssertionRelease(macPowerSavingDisabled);
+    appNapDisabler = std::nullopt;
 #endif
 }
 
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h
index ebb32238d67..02ccb9709dc 100644
--- a/src/testlib/qtestcase.h
+++ b/src/testlib/qtestcase.h
@@ -15,6 +15,7 @@
 #include <QtCore/qtemporarydir.h>
 #include <QtCore/qthread.h>
 
+#include <chrono>
 #ifdef __cpp_concepts
 #include <concepts>
 #endif
@@ -430,7 +431,7 @@ namespace QTest
     Q_TESTLIB_EXPORT int qExec(QObject *testObject, const QStringList &arguments);
 
 #if QT_CONFIG(batch_test_support) || defined(Q_QDOC)
-    using TestEntryFunction = int (*)(int, char **);
+    using TestEntryFunction = std::function<int(int, char **)>;
     Q_TESTLIB_EXPORT void qRegisterTestCase(const QString &name, TestEntryFunction entryFunction);
 #endif  // QT_CONFIG(batch_test_support)
 
diff --git a/src/testlib/qtestregistry_p.h b/src/testlib/qtestregistry_p.h
index 85e236cd046..fcfa6c60701 100644
--- a/src/testlib/qtestregistry_p.h
+++ b/src/testlib/qtestregistry_p.h
@@ -26,7 +26,7 @@ QT_BEGIN_NAMESPACE
 namespace QTest {
 class TestRegistry {
 public:
-    using TestEntryFunction = int(*)(int argv, char** argc);
+    using TestEntryFunction = std::function<int(int, char **)>;
 
     static TestRegistry* instance();