2 files changed, 35 insertions, 38 deletions
diff --git a/tests/auto/corelib/io/qprocess/test/CMakeLists.txt b/tests/auto/corelib/io/qprocess/test/CMakeLists.txt
index 0541b4258a..89893583ac 100644
--- a/tests/auto/corelib/io/qprocess/test/CMakeLists.txt
+++ b/tests/auto/corelib/io/qprocess/test/CMakeLists.txt
@@ -1,29 +1,48 @@
-# Generated from test.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## tst_qprocess Test:
 #####################################################################
 
-qt_add_test(tst_qprocess
+qt_internal_add_test(tst_qprocess
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
     SOURCES
-        ../../../../../shared/emulationdetector.h
         ../tst_qprocess.cpp
-    INCLUDE_DIRECTORIES
-        ../../../../../shared
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::CorePrivate
         Qt::Network
+        Qt::TestPrivate
 )
 
-#### Keys ignored in scope 1:.:.:test.pro:<TRUE>:
-# TEST_HELPER_INSTALLS = "../testProcessSpacesArgs/nospace" "../testProcessSpacesArgs/one space" "../testProcessSpacesArgs/two space s" "../test Space In Name/testSpaceInName"
-
-## Scopes:
-#####################################################################
-
-#### Keys ignored in scope 2:.:.:test.pro:WIN32:
-# TESTDATA = "../testBatFiles/*"
+## Build assorted sub-programs called from the test:
+add_dependencies(tst_qprocess
+    testProcessCrash
+    testProcessEcho
+    testProcessEcho2
+    testProcessEcho3
+    testProcessEnvironment
+    testProcessHang
+    testProcessNormal
+    testProcessOutput
+    testProcessDeadWhileReading
+    testProcessEOF
+    testExitCodes
+    testForwarding
+    testDetached
+    fileWriterProcess
+    testSetWorkingDirectory
+    testSoftExit
+    nospace onespace twospaces
+    testSpaceInName
+)
+if(TARGET Qt::Widgets)
+    add_dependencies(tst_qprocess testGuiProcess)
+endif()
+if(WIN32)
+    add_dependencies(tst_qprocess testProcessEchoGui testSetNamedPipeHandleState)
+endif()
 
-#### Keys ignored in scope 5:.:..:../qprocess.pri:NOT TARGET Qt::Widgets:
-# SUBPROGRAMS = "-testGuiProcess"
+if(UNIX)
+    add_dependencies(tst_qprocess testUnixProcessParameters)
+endif()
diff --git a/tests/auto/corelib/io/qprocess/test/test.pro b/tests/auto/corelib/io/qprocess/test/test.pro
deleted file mode 100644
index 63187c9668..0000000000
--- a/tests/auto/corelib/io/qprocess/test/test.pro
+++ /dev/null
@@ -1,22 +0,0 @@
-CONFIG += testcase
-CONFIG -= debug_and_release_target
-QT = core-private testlib network
-SOURCES = ../tst_qprocess.cpp
-INCLUDEPATH += ../../../../../shared
-HEADERS += ../../../../../shared/emulationdetector.h
-
-TARGET = ../tst_qprocess
-
-win32:TESTDATA += ../testBatFiles/*
-
-include(../qprocess.pri)
-
-mac:CONFIG += insignificant_test # QTBUG-25895 - sometimes hangs
-
-for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../$${file}/$${file}"
-
-TEST_HELPER_INSTALLS += \
-    ../testProcessSpacesArgs/nospace \
-    "../testProcessSpacesArgs/one space" \
-    "../testProcessSpacesArgs/two space s" \
-    "../test Space In Name/testSpaceInName"