2 files changed, 6 insertions, 11 deletions
diff --git a/tests/auto/corelib/thread/qthreadstorage/CMakeLists.txt b/tests/auto/corelib/thread/qthreadstorage/CMakeLists.txt
index 1340b30388..26a691e8ca 100644
--- a/tests/auto/corelib/thread/qthreadstorage/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qthreadstorage/CMakeLists.txt
@@ -1,6 +1,3 @@
-# special case skip regeneration
-# Generated from qthreadstorage.pro.
-
 #####################################################################
 ## tst_qthreadstorage Test:
 #####################################################################
@@ -15,4 +12,7 @@ qt_internal_add_test(tst_qthreadstorage
 
 if(NOT ANDROID)
     add_subdirectory(crashonexit)
+    if(QT_FEATURE_process)
+        add_dependencies(tst_qthreadstorage crashOnExit_helper)
+    endif()
 endif()
diff --git a/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt b/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt
index a6de9678c0..c76dbda738 100644
--- a/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt
@@ -1,15 +1,10 @@
-# Generated from crashonexit.pro.
-
 #####################################################################
 ## crashonexit Binary:
 #####################################################################
 
-qt_internal_add_executable(crashOnExit_helper # special case
-    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.." # special case
-    INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashOnExit_helper" # special case
+qt_internal_add_executable(crashOnExit_helper
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.."
+    INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashOnExit_helper"
     SOURCES
         crashOnExit.cpp
 )
-
-## Scopes:
-#####################################################################