Regenerate tests/auto/network/socket

Change-Id: I653f7f4a6e3421f56f873cfbec4309eca49f1756
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

14 files changed, 69 insertions, 35 deletions

diff --git a/tests/auto/network/socket/platformsocketengine/CMakeLists.txt b/tests/auto/network/socket/platformsocketengine/CMakeLists.txt
index b48bc1def1..db36c633a4 100644
--- a/tests/auto/network/socket/platformsocketengine/CMakeLists.txt
+++ b/tests/auto/network/socket/platformsocketengine/CMakeLists.txt
@@ -1,11 +1,14 @@
 # Generated from platformsocketengine.pro.
 
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
 #####################################################################
 ## tst_platformsocketengine Test:
 #####################################################################
 
 add_qt_test(tst_platformsocketengine
-    GUI
     SOURCES
         tst_platformsocketengine.cpp
     INCLUDE_DIRECTORIES
@@ -18,8 +21,8 @@ add_qt_test(tst_platformsocketengine
 )
 
 #### Keys ignored in scope 1:.:.:platformsocketengine.pro:<TRUE>:
-# CONFIG = "testcase"
 # MOC_DIR = "tmp"
+# _REQUIREMENTS = "qtConfig(private_tests)"
 
 ## Scopes:
 #####################################################################
@@ -32,6 +35,6 @@ extend_target(tst_platformsocketengine CONDITION WIN32
 extend_target(tst_platformsocketengine CONDITION QT_FEATURE_reduce_exports AND UNIX
     SOURCES
         ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine.cpp
-        ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine.cpp
+        ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine.cpp ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine_p.h
         ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine_unix.cpp
 )
diff --git a/tests/auto/network/socket/qabstractsocket/CMakeLists.txt b/tests/auto/network/socket/qabstractsocket/CMakeLists.txt
index 6bfba3efc4..ca7d64a2ff 100644
--- a/tests/auto/network/socket/qabstractsocket/CMakeLists.txt
+++ b/tests/auto/network/socket/qabstractsocket/CMakeLists.txt
@@ -5,12 +5,8 @@
 #####################################################################
 
 add_qt_test(tst_qabstractsocket
-    GUI
     SOURCES
         tst_qabstractsocket.cpp
     PUBLIC_LIBRARIES
         Qt::Network
 )
-
-#### Keys ignored in scope 1:.:.:qabstractsocket.pro:<TRUE>:
-# CONFIG = "testcase"
diff --git a/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt b/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt
index 7d6193ee54..2deeea34d1 100644
--- a/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt
+++ b/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt
@@ -1,11 +1,14 @@
 # Generated from qhttpsocketengine.pro.
 
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
 #####################################################################
 ## tst_qhttpsocketengine Test:
 #####################################################################
 
 add_qt_test(tst_qhttpsocketengine
-    GUI
     SOURCES
         tst_qhttpsocketengine.cpp
     INCLUDE_DIRECTORIES
@@ -18,14 +21,13 @@ add_qt_test(tst_qhttpsocketengine
 )
 
 #### Keys ignored in scope 1:.:.:qhttpsocketengine.pro:<TRUE>:
-# CONFIG = "testcase"
 # MOC_DIR = "tmp"
+# _REQUIREMENTS = "qtConfig(private_tests)"
 
 ## Scopes:
 #####################################################################
 
 #### Keys ignored in scope 2:.:.:qhttpsocketengine.pro:LINUX:
-# CONFIG = "unsupported/testserver"
 # QT_TEST_SERVER_LIST = "squid" "danted" "cyrus" "apache2"
 
 extend_target(tst_qhttpsocketengine CONDITION WIN32
@@ -36,6 +38,6 @@ extend_target(tst_qhttpsocketengine CONDITION WIN32
 extend_target(tst_qhttpsocketengine CONDITION QT_FEATURE_reduce_exports AND UNIX
     SOURCES
         ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine.cpp
-        ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine.cpp
+        ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine.cpp ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine_p.h
         ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine_unix.cpp
 )
diff --git a/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt b/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt
index df1c934ec8..cb339eb2fa 100644
--- a/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt
+++ b/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 add_qt_executable(socketprocess
-    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./"
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/socket/qlocalsocket/test/CMakeLists.txt b/tests/auto/network/socket/qlocalsocket/test/CMakeLists.txt
index eb90b27c40..eb427796ae 100644
--- a/tests/auto/network/socket/qlocalsocket/test/CMakeLists.txt
+++ b/tests/auto/network/socket/qlocalsocket/test/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_test(tst_qlocalsocket
-    GUI
     SOURCES
         ../tst_qlocalsocket.cpp
     DEFINES
@@ -16,9 +15,6 @@ add_qt_test(tst_qlocalsocket
         Qt::Network
 )
 
-#### Keys ignored in scope 1:.:.:test.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
diff --git a/tests/auto/network/socket/qsctpsocket/CMakeLists.txt b/tests/auto/network/socket/qsctpsocket/CMakeLists.txt
index fff83ad9d3..d272d018b6 100644
--- a/tests/auto/network/socket/qsctpsocket/CMakeLists.txt
+++ b/tests/auto/network/socket/qsctpsocket/CMakeLists.txt
@@ -5,12 +5,8 @@
 #####################################################################
 
 add_qt_test(tst_qsctpsocket
-    GUI
     SOURCES
         tst_qsctpsocket.cpp
     PUBLIC_LIBRARIES
         Qt::Network
 )
-
-#### Keys ignored in scope 1:.:.:qsctpsocket.pro:<TRUE>:
-# CONFIG = "testcase"
diff --git a/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt b/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt
index 34b98b3891..aa3be26d9b 100644
--- a/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt
+++ b/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt
@@ -1,11 +1,14 @@
 # Generated from qsocks5socketengine.pro.
 
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
 #####################################################################
 ## tst_qsocks5socketengine Test:
 #####################################################################
 
 add_qt_test(tst_qsocks5socketengine
-    GUI
     SOURCES
         tst_qsocks5socketengine.cpp
     INCLUDE_DIRECTORIES
@@ -18,14 +21,13 @@ add_qt_test(tst_qsocks5socketengine
 )
 
 #### Keys ignored in scope 1:.:.:qsocks5socketengine.pro:<TRUE>:
-# CONFIG = "testcase"
 # MOC_DIR = "tmp"
+# _REQUIREMENTS = "qtConfig(private_tests)"
 
 ## Scopes:
 #####################################################################
 
 #### Keys ignored in scope 2:.:.:qsocks5socketengine.pro:LINUX:
-# CONFIG = "unsupported/testserver"
 # QT_TEST_SERVER_LIST = "danted" "apache2" "cyrus"
 
 extend_target(tst_qsocks5socketengine CONDITION WIN32
@@ -36,6 +38,6 @@ extend_target(tst_qsocks5socketengine CONDITION WIN32
 extend_target(tst_qsocks5socketengine CONDITION QT_FEATURE_reduce_exports AND UNIX
     SOURCES
         ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine.cpp
-        ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine.cpp
+        ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine.cpp ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine_p.h
         ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine_unix.cpp
 )
diff --git a/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt b/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt
index 05035780b5..aaceafbff3 100644
--- a/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt
+++ b/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 add_qt_executable(crashingServer
     GUI
-    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./"
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt b/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt
index af31c0762f..df05c5012b 100644
--- a/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt
+++ b/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_test(tst_qtcpserver
-    GUI
     SOURCES
         ../tst_qtcpserver.cpp
     PUBLIC_LIBRARIES
@@ -13,7 +12,6 @@ add_qt_test(tst_qtcpserver
 )
 
 #### Keys ignored in scope 1:.:.:test.pro:<TRUE>:
-# CONFIG = "testcase"
 # MOC_DIR = "tmp"
 
 ## Scopes:
@@ -25,5 +23,4 @@ extend_target(tst_qtcpserver CONDITION WIN32
 )
 
 #### Keys ignored in scope 6:.:.:test.pro:LINUX:
-# CONFIG = "unsupported/testserver"
 # QT_TEST_SERVER_LIST = "danted" "cyrus" "squid" "ftp-proxy"
diff --git a/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt
index 381a5a72de..da9d3a324f 100644
--- a/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt
+++ b/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 add_qt_executable(stressTest
-    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./"
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         Test.cpp Test.h
         main.cpp
diff --git a/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..238c6b9931
--- /dev/null
+++ b/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from test.pro.
+
+#####################################################################
+## tst_qtcpsocket Test:
+#####################################################################
+
+add_qt_test(tst_qtcpsocket
+    SOURCES
+        ../tst_qtcpsocket.cpp
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::NetworkPrivate
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qtcpsocket CONDITION WIN32
+    PUBLIC_LIBRARIES
+        ws2_32
+)
+
+#### Keys ignored in scope 4:.:.:test.pro:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# DESTDIR = "../debug"
+
+#### Keys ignored in scope 5:.:.:test.pro:else:
+# DESTDIR = "../release"
+
+#### Keys ignored in scope 6:.:.:test.pro:else:
+# DESTDIR = "../"
+
+#### Keys ignored in scope 7:.:.:test.pro:LINUX:
+# QT_TEST_SERVER_LIST = "danted" "squid" "apache2" "ftp-proxy" "vsftpd" "iptables" "cyrus"
diff --git a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt
index 19cb1256cc..9523830a15 100644
--- a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt
+++ b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_test(tst_qtcpsocket
-    GUI
     SOURCES
         ../tst_qtcpsocket.cpp
     LIBRARIES
@@ -15,9 +14,6 @@ add_qt_test(tst_qtcpsocket
         Qt::Network
 )
 
-#### Keys ignored in scope 1:.:.:test.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
@@ -42,5 +38,4 @@ target_link_libraries(tst_qtcpsocket PRIVATE Threads::Threads)
 # DESTDIR = "../"
 
 #### Keys ignored in scope 7:.:.:test.pro:LINUX:
-# CONFIG = "unsupported/testserver"
 # QT_TEST_SERVER_LIST = "danted" "squid" "apache2" "ftp-proxy" "vsftpd" "iptables" "cyrus"
diff --git a/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt b/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt
index 057445675e..8b594c6913 100644
--- a/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt
+++ b/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt
@@ -5,7 +5,7 @@
 #####################################################################
 
 add_qt_executable(clientserver
-    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./"
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/network/socket/qudpsocket/udpServer/.prev_CMakeLists.txt b/tests/auto/network/socket/qudpsocket/udpServer/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..be9819466f
--- /dev/null
+++ b/tests/auto/network/socket/qudpsocket/udpServer/.prev_CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from udpServer.pro.
+
+#####################################################################
+## udpServer Binary:
+#####################################################################
+
+add_qt_executable(udpServer
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+)