4 files changed, 13 insertions, 62 deletions
diff --git a/tests/auto/testlib/selftests/skip/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/skip/.prev_CMakeLists.txt
deleted file mode 100644
index 74d7e19cf3..0000000000
--- a/tests/auto/testlib/selftests/skip/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-# Generated from skip.pro.
-
-#####################################################################
-## skip Binary:
-#####################################################################
-
-qt_add_executable(skip
-    SOURCES
-        tst_skip.cpp
-    PUBLIC_LIBRARIES
-        Qt::Test
-)
-
-## Scopes:
-#####################################################################
diff --git a/tests/auto/testlib/selftests/skip/CMakeLists.txt b/tests/auto/testlib/selftests/skip/CMakeLists.txt
index 5b7e35e4ce..6fb38cc976 100644
--- a/tests/auto/testlib/selftests/skip/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/skip/CMakeLists.txt
@@ -1,21 +1,21 @@
-# Generated from skip.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## skip Binary:
 #####################################################################
 
-qt_add_executable(skip
-    NO_INSTALL # special case
-    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+qt_internal_add_executable(skip
+    NO_INSTALL
+    EXCEPTIONS
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     SOURCES
         tst_skip.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Test
 )
 
 ## Scopes:
 #####################################################################
 
-# special case begin
-qt_apply_testlib_coverage_options(skip)
-# special case end
+qt_internal_apply_testlib_coverage_options(skip)
diff --git a/tests/auto/testlib/selftests/skip/skip.pro b/tests/auto/testlib/selftests/skip/skip.pro
deleted file mode 100644
index 19a01908af..0000000000
--- a/tests/auto/testlib/selftests/skip/skip.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-SOURCES += tst_skip.cpp
-QT = core testlib
-
-mac:CONFIG -= app_bundle
-CONFIG -= debug_and_release_target
-
-TARGET = skip
-
-include($$QT_SOURCE_TREE/src/testlib/selfcover.pri)
diff --git a/tests/auto/testlib/selftests/skip/tst_skip.cpp b/tests/auto/testlib/selftests/skip/tst_skip.cpp
index 2fdc531a3a..709080049a 100644
--- a/tests/auto/testlib/selftests/skip/tst_skip.cpp
+++ b/tests/auto/testlib/selftests/skip/tst_skip.cpp
@@ -1,34 +1,9 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 
 #include <QtCore/QCoreApplication>
-#include <QtTest/QtTest>
+#include <QTest>
 
 class tst_Skip: public QObject
 {
@@ -57,7 +32,7 @@ void tst_Skip::test_data()
 
 void tst_Skip::test()
 {
-    qDebug("this line should never be reached, since we skip in the _data function");
+    QFAIL("this line should never be reached, since we skip in the _data function");
 }
 
 void tst_Skip::emptytest_data()
@@ -67,7 +42,7 @@ void tst_Skip::emptytest_data()
 
 void tst_Skip::emptytest()
 {
-    qDebug("this line should never be reached, since we skip in the _data function");
+    QFAIL("this line should never be reached, since we skip in the _data function");
 }
 
 void tst_Skip::singleSkip_data()