Regenerate tests that use helper processes

This is needed to make sure the output directory is in the correct
place somewhere under tests, rather than in $prefix/bin.

Change-Id: I98afa9c0a7517a8a10866b4c626bd4c4d2fd214f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Qt CMake Build Bot

11 files changed, 15 insertions, 37 deletions

diff --git a/tests/auto/corelib/kernel/qobject/signalbug/CMakeLists.txt b/tests/auto/corelib/kernel/qobject/signalbug/CMakeLists.txt
index b08752030d..4d641bcef8 100644
--- a/tests/auto/corelib/kernel/qobject/signalbug/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qobject/signalbug/CMakeLists.txt
@@ -1,11 +1,10 @@
 # Generated from signalbug.pro.
 
 #####################################################################
-## signalbug Binary:
+## signalbug_helper Binary:
 #####################################################################
 
-add_qt_executable(signalbug
-    GUI
+add_qt_test_helper(signalbug_helper
     SOURCES
         signalbug.cpp signalbug.h
 )
diff --git a/tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt b/tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt
index 4b8ff79857..da13968cc4 100644
--- a/tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt
@@ -1,11 +1,10 @@
 # Generated from producerconsumer.pro.
 
 #####################################################################
-## producerconsumer Binary:
+## producerconsumer_helper Binary:
 #####################################################################
 
-add_qt_executable(producerconsumer
-    GUI
+add_qt_test_helper(producerconsumer_helper
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt b/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt
index 113cc02365..795afb28c5 100644
--- a/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt
@@ -1,11 +1,10 @@
 # Generated from acquirerelease.pro.
 
 #####################################################################
-## acquirerelease Binary:
+## acquirerelease_helper Binary:
 #####################################################################
 
-add_qt_executable(acquirerelease
-    GUI
+add_qt_test_helper(acquirerelease_helper
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt
index 358bb235ed..be61e0d4b6 100644
--- a/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt
@@ -5,8 +5,9 @@
 #####################################################################
 
 add_qt_executable(qpong
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./"
     SOURCES
         qpong.cpp
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::DBus
 )
diff --git a/tests/auto/network/access/qnetworkreply/echo/CMakeLists.txt b/tests/auto/network/access/qnetworkreply/echo/CMakeLists.txt
index acb3f8a82e..f260b97b8d 100644
--- a/tests/auto/network/access/qnetworkreply/echo/CMakeLists.txt
+++ b/tests/auto/network/access/qnetworkreply/echo/CMakeLists.txt
@@ -5,9 +5,7 @@
 #####################################################################
 
 add_qt_executable(echo
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
         main.cpp
 )
-
-#### Keys ignored in scope 1:.:.:echo.pro:<TRUE>:
-# CONFIG = "-debug_and_release_target" "cmdline"
diff --git a/tests/auto/network/bearer/qnetworksession/lackey/CMakeLists.txt b/tests/auto/network/bearer/qnetworksession/lackey/CMakeLists.txt
index a3937cdb43..717b62e0ca 100644
--- a/tests/auto/network/bearer/qnetworksession/lackey/CMakeLists.txt
+++ b/tests/auto/network/bearer/qnetworksession/lackey/CMakeLists.txt
@@ -5,12 +5,9 @@
 #####################################################################
 
 add_qt_executable(lackey
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./"
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
         Qt::Network
 )
-
-#### Keys ignored in scope 1:.:.:lackey.pro:<TRUE>:
-# CONFIG = "cmdline"
-# DESTDIR = "./"
diff --git a/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt b/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt
index 74fae14b7e..df1c934ec8 100644
--- a/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt
+++ b/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt
@@ -5,13 +5,10 @@
 #####################################################################
 
 add_qt_executable(socketprocess
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./"
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
         Qt::Network
         Qt::Test
 )
-
-#### Keys ignored in scope 1:.:.:socketprocess.pro:<TRUE>:
-# CONFIG = "cmdline"
-# DESTDIR = "./"
diff --git a/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt b/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt
index 49ba806e1b..05035780b5 100644
--- a/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt
+++ b/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt
@@ -6,18 +6,12 @@
 
 add_qt_executable(crashingServer
     GUI
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./"
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
         Qt::Network
 )
 
-#### Keys ignored in scope 1:.:.:crashingServer.pro:<TRUE>:
-# CONFIG = "-app_bundle"
-# DESTDIR = "./"
-
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:crashingServer.pro:mingw:
-# CONFIG = "console"
diff --git a/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt
index 03c40c1a1f..381a5a72de 100644
--- a/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt
+++ b/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt
@@ -5,6 +5,7 @@
 #####################################################################
 
 add_qt_executable(stressTest
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./"
     SOURCES
         Test.cpp Test.h
         main.cpp
@@ -14,7 +15,5 @@ add_qt_executable(stressTest
 )
 
 #### Keys ignored in scope 1:.:.:stressTest.pro:<TRUE>:
-# CONFIG = "cmdline"
-# DESTDIR = "./"
 # MOC_DIR = ".moc/"
 # TMP_DIR = ".tmp/"
diff --git a/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt b/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt
index 8af58786b9..057445675e 100644
--- a/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt
+++ b/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt
@@ -5,12 +5,9 @@
 #####################################################################
 
 add_qt_executable(clientserver
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./"
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
         Qt::Network
 )
-
-#### Keys ignored in scope 1:.:.:clientserver.pro:<TRUE>:
-# CONFIG = "cmdline"
-# DESTDIR = "./"
diff --git a/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt b/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt
index cc50d1a1d0..d9da87126f 100644
--- a/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt
+++ b/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt
@@ -5,11 +5,9 @@
 #####################################################################
 
 add_qt_executable(udpServer
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./" # special case
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
         Qt::Network
 )
-
-#### Keys ignored in scope 1:.:.:udpServer.pro:<TRUE>:
-# CONFIG = "cmdline"