Regenerate before merge

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

12 files changed, 61 insertions, 3 deletions

diff --git a/tests/.prev_CMakeLists.txt b/tests/.prev_CMakeLists.txt
new file mode 100644
index 0000000..806a854
--- /dev/null
+++ b/tests/.prev_CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from tests.pro.
+
+if(NOT TARGET Qt::Test)
+    cmake_minimum_required(VERSION 3.15.0)
+    project(QtWebSocketsTests VERSION 6.0.0 LANGUAGES C CXX)
+    find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL)
+    find_package(Qt6 ${PROJECT_VERSION} OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL)
+    qt_set_up_standalone_tests_build()
+endif()
+qt_build_tests()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8179d6c..3d7cc10 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,10 +1,11 @@
-# special case begin
+# Generated from tests.pro.
+
 if(NOT TARGET Qt::Test)
     cmake_minimum_required(VERSION 3.15.0)
     project(QtWebSocketsTests VERSION 6.0.0 LANGUAGES C CXX)
-    find_package(Qt6 REQUIRED COMPONENTS BuildInternals Core Network Test Qml Quick QuickTest WebSockets)
+    find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS BuildInternals Core Network Test Qml Quick QuickTest WebSockets) # special case
     qt_set_up_standalone_tests_build()
 endif()
-# special case end
 
 qt_build_tests()
+
diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt
new file mode 100644
index 0000000..39b8e8d
--- /dev/null
+++ b/tests/auto/.prev_CMakeLists.txt
@@ -0,0 +1,7 @@
+# Generated from auto.pro.
+
+add_subdirectory(cmake)
+add_subdirectory(websockets)
+if(TARGET Qt::Quick)
+    add_subdirectory(qml)
+endif()
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index cfe7447..b9730a2 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -1,5 +1,6 @@
 # Generated from auto.pro.
 
+# add_subdirectory(cmake) # special case remove
 add_subdirectory(websockets)
 if(TARGET Qt::Quick)
     add_subdirectory(qml)
diff --git a/tests/auto/qml/.prev_CMakeLists.txt b/tests/auto/qml/.prev_CMakeLists.txt
new file mode 100644
index 0000000..e8d92cc
--- /dev/null
+++ b/tests/auto/qml/.prev_CMakeLists.txt
@@ -0,0 +1,6 @@
+# Generated from qml.pro.
+
+if(NOT APPLE_UIKIT)
+    add_subdirectory(qmlwebsockets)
+    add_subdirectory(qmlwebsockets_compat)
+endif()
diff --git a/tests/auto/qml/CMakeLists.txt b/tests/auto/qml/CMakeLists.txt
index 8562441..41470a7 100644
--- a/tests/auto/qml/CMakeLists.txt
+++ b/tests/auto/qml/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Generated from qml.pro.
+
 if(NOT APPLE_UIKIT)
     add_subdirectory(qmlwebsockets)
+    # add_subdirectory(qmlwebsockets_compat) # special case remove
 endif()
diff --git a/tests/auto/websockets/dataprocessor/CMakeLists.txt b/tests/auto/websockets/dataprocessor/CMakeLists.txt
index 523a7a4..c1ec133 100644
--- a/tests/auto/websockets/dataprocessor/CMakeLists.txt
+++ b/tests/auto/websockets/dataprocessor/CMakeLists.txt
@@ -1,5 +1,9 @@
 # Generated from dataprocessor.pro.
 
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
 #####################################################################
 ## tst_dataprocessor Test:
 #####################################################################
@@ -15,3 +19,4 @@ add_qt_test(tst_dataprocessor
 
 #### Keys ignored in scope 1:.:.:dataprocessor.pro:<TRUE>:
 # TEMPLATE = "app"
+# _REQUIREMENTS = "qtConfig(private_tests)"
diff --git a/tests/auto/websockets/handshakerequest/CMakeLists.txt b/tests/auto/websockets/handshakerequest/CMakeLists.txt
index b0b3333..e177988 100644
--- a/tests/auto/websockets/handshakerequest/CMakeLists.txt
+++ b/tests/auto/websockets/handshakerequest/CMakeLists.txt
@@ -1,5 +1,9 @@
 # Generated from handshakerequest.pro.
 
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
 #####################################################################
 ## tst_handshakerequest Test:
 #####################################################################
@@ -15,3 +19,4 @@ add_qt_test(tst_handshakerequest
 
 #### Keys ignored in scope 1:.:.:handshakerequest.pro:<TRUE>:
 # TEMPLATE = "app"
+# _REQUIREMENTS = "qtConfig(private_tests)"
diff --git a/tests/auto/websockets/handshakeresponse/CMakeLists.txt b/tests/auto/websockets/handshakeresponse/CMakeLists.txt
index 75d81f0..e22716c 100644
--- a/tests/auto/websockets/handshakeresponse/CMakeLists.txt
+++ b/tests/auto/websockets/handshakeresponse/CMakeLists.txt
@@ -1,5 +1,9 @@
 # Generated from handshakeresponse.pro.
 
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
 #####################################################################
 ## tst_handshakeresponse Test:
 #####################################################################
@@ -15,3 +19,4 @@ add_qt_test(tst_handshakeresponse
 
 #### Keys ignored in scope 1:.:.:handshakeresponse.pro:<TRUE>:
 # TEMPLATE = "app"
+# _REQUIREMENTS = "qtConfig(private_tests)"
diff --git a/tests/auto/websockets/qdefaultmaskgenerator/CMakeLists.txt b/tests/auto/websockets/qdefaultmaskgenerator/CMakeLists.txt
index 27d2e36..8761565 100644
--- a/tests/auto/websockets/qdefaultmaskgenerator/CMakeLists.txt
+++ b/tests/auto/websockets/qdefaultmaskgenerator/CMakeLists.txt
@@ -1,5 +1,9 @@
 # Generated from qdefaultmaskgenerator.pro.
 
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
 #####################################################################
 ## tst_defaultmaskgenerator Test:
 #####################################################################
@@ -15,3 +19,4 @@ add_qt_test(tst_defaultmaskgenerator
 
 #### Keys ignored in scope 1:.:.:qdefaultmaskgenerator.pro:<TRUE>:
 # TEMPLATE = "app"
+# _REQUIREMENTS = "qtConfig(private_tests)"
diff --git a/tests/auto/websockets/websocketframe/CMakeLists.txt b/tests/auto/websockets/websocketframe/CMakeLists.txt
index 47baf69..565c106 100644
--- a/tests/auto/websockets/websocketframe/CMakeLists.txt
+++ b/tests/auto/websockets/websocketframe/CMakeLists.txt
@@ -1,5 +1,9 @@
 # Generated from websocketframe.pro.
 
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
 #####################################################################
 ## tst_websocketframe Test:
 #####################################################################
@@ -15,3 +19,4 @@ add_qt_test(tst_websocketframe
 
 #### Keys ignored in scope 1:.:.:websocketframe.pro:<TRUE>:
 # TEMPLATE = "app"
+# _REQUIREMENTS = "qtConfig(private_tests)"
diff --git a/tests/auto/websockets/websocketprotocol/CMakeLists.txt b/tests/auto/websockets/websocketprotocol/CMakeLists.txt
index 914720b..66a011f 100644
--- a/tests/auto/websockets/websocketprotocol/CMakeLists.txt
+++ b/tests/auto/websockets/websocketprotocol/CMakeLists.txt
@@ -1,5 +1,9 @@
 # Generated from websocketprotocol.pro.
 
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
 #####################################################################
 ## tst_websocketprotocol Test:
 #####################################################################
@@ -15,3 +19,4 @@ add_qt_test(tst_websocketprotocol
 
 #### Keys ignored in scope 1:.:.:websocketprotocol.pro:<TRUE>:
 # TEMPLATE = "app"
+# _REQUIREMENTS = "qtConfig(private_tests)"