3 files changed, 9 insertions, 40 deletions
diff --git a/tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt
deleted file mode 100644
index fcef3dc5ec..0000000000
--- a/tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated from verbose2.pro.
-
-#####################################################################
-## verbose2 Binary:
-#####################################################################
-
-qt_add_executable(verbose2
-    SOURCES
-        ../counting/tst_counting.cpp
-    DEFINES
-        TESTLIB_VERBOSITY_ARG="-v2"
-    PUBLIC_LIBRARIES
-        Qt::Test
-)
-
-## Scopes:
-#####################################################################
diff --git a/tests/auto/testlib/selftests/verbose2/CMakeLists.txt b/tests/auto/testlib/selftests/verbose2/CMakeLists.txt
index 99a821d452..b78c5a42d0 100644
--- a/tests/auto/testlib/selftests/verbose2/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/verbose2/CMakeLists.txt
@@ -1,23 +1,23 @@
-# Generated from verbose2.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## verbose2 Binary:
 #####################################################################
 
-qt_add_executable(verbose2
-    NO_INSTALL # special case
-    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+qt_internal_add_executable(verbose2
+    NO_INSTALL
+    EXCEPTIONS
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     SOURCES
         ../counting/tst_counting.cpp
     DEFINES
-        TESTLIB_VERBOSITY_ARG=-v2 # special case remove quotes
-    PUBLIC_LIBRARIES
+        TESTLIB_VERBOSITY_ARG=-v2
+    LIBRARIES
         Qt::Test
 )
 
 ## Scopes:
 #####################################################################
 
-# special case begin
-qt_apply_testlib_coverage_options(verbose2)
-# special case end
+qt_internal_apply_testlib_coverage_options(verbose2)
diff --git a/tests/auto/testlib/selftests/verbose2/verbose2.pro b/tests/auto/testlib/selftests/verbose2/verbose2.pro
deleted file mode 100644
index d4765f01b5..0000000000
--- a/tests/auto/testlib/selftests/verbose2/verbose2.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-# This test just reuses the counting selftest to show how the output
-# differs when the -v2 command-line switch is used.
-
-SOURCES += ../counting/tst_counting.cpp
-QT = core testlib
-
-DEFINES += TESTLIB_VERBOSITY_ARG="-v2"
-
-mac:CONFIG -= app_bundle
-CONFIG -= debug_and_release_target
-
-TARGET = verbose2
-
-include($$QT_SOURCE_TREE/src/testlib/selfcover.pri)