2 files changed, 7 insertions, 29 deletions
diff --git a/tests/auto/testlib/selftests/silent/CMakeLists.txt b/tests/auto/testlib/selftests/silent/CMakeLists.txt
index d029aa8021..76bb0d0110 100644
--- a/tests/auto/testlib/selftests/silent/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/silent/CMakeLists.txt
@@ -1,21 +1,21 @@
-# Generated from silent.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## silent Binary:
 #####################################################################
 
 qt_internal_add_executable(silent
-    NO_INSTALL # special case
-    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    NO_INSTALL
+    EXCEPTIONS
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     SOURCES
         tst_silent.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::TestPrivate
 )
 
 ## Scopes:
 #####################################################################
 
-# special case begin
 qt_internal_apply_testlib_coverage_options(silent)
-# special case end
diff --git a/tests/auto/testlib/selftests/silent/tst_silent.cpp b/tests/auto/testlib/selftests/silent/tst_silent.cpp
index 3b2caf8c24..a1e7f7af57 100644
--- a/tests/auto/testlib/selftests/silent/tst_silent.cpp
+++ b/tests/auto/testlib/selftests/silent/tst_silent.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2021 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 <QtCore/QCoreApplication>
 #include <QTest>
@@ -15,8 +15,6 @@ private slots:
     void fail();
     void xfail();
     void xpass();
-
-    // This test function must be last, as it calls qFatal().
     void messages();
 };
 
@@ -47,17 +45,6 @@ void tst_Silent::xpass()
     QVERIFY2(true, "This test should XPASS");
 }
 
-#ifndef Q_OS_WIN
-#include <signal.h>
-#include <setjmp.h>
-
-static jmp_buf state;
-static void abort_handler(int)
-{
-    longjmp(state, 1);
-}
-#endif
-
 void tst_Silent::messages()
 {
     qWarning("This is a warning that should not appear in silent test output");
@@ -66,15 +53,6 @@ void tst_Silent::messages()
     qCritical("This is a critical message that should not appear in silent test output");
     qInfo("This is an info message that should not appear in silent test output");
     QTestLog::info("This is an internal testlib info message that should not appear in silent test output", __FILE__, __LINE__);
-
-#ifndef Q_OS_WIN
-    // We're testing qFatal, but we don't want to actually std::abort() !
-    auto prior = signal(SIGABRT, abort_handler);
-    if (setjmp(state))
-        signal(SIGABRT, prior);
-    else
-#endif
-        qFatal("This is a fatal error message that should still appear in silent test output");
 }
 
 QTEST_MAIN_WRAPPER(tst_Silent,