Regenerate before merge

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

24 files changed, 108 insertions, 21 deletions

diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt
new file mode 100644
index 0000000..ca50e03
--- /dev/null
+++ b/.prev_CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from qtwebsockets.pro.
+
+cmake_minimum_required(VERSION 3.15.0)
+
+project(QtWebSockets
+    VERSION 6.0.0
+    DESCRIPTION "Qt WebSockets Libraries"
+    HOMEPAGE_URL "https://qt.io/"
+    LANGUAGES CXX C
+)
+
+find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL)
+find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL)
+
+if(NOT TARGET Qt::Network)
+    message(NOTICE "Skipping the build as the condition \"TARGET Qt::Network\" is not met.")
+    return()
+endif()
+qt_build_repo()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1cfcae..59289c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,20 @@
+# Generated from qtwebsockets.pro.
+
 cmake_minimum_required(VERSION 3.15.0)
 
-project(QtWebSockets
+project(QtWebSockets # special case
     VERSION 6.0.0
-    DESCRIPTION "Qt WebSockets Libraries"
+    DESCRIPTION "Qt WebSockets Libraries" # special case
     HOMEPAGE_URL "https://qt.io/"
     LANGUAGES CXX C
 )
 
-find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Network)
-find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Quick QuickTest)
+find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Network) # special case
+find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Quick QuickTest) # special case
+
+if(NOT TARGET Qt::Network)
+    message(NOTICE "Skipping the build as the condition \"TARGET Qt::Network\" is not met.")
+    return()
+endif()
 qt_build_repo()
+
diff --git a/examples/websockets/echoclient/CMakeLists.txt b/examples/websockets/echoclient/CMakeLists.txt
index ae0df62..aab7d04 100644
--- a/examples/websockets/echoclient/CMakeLists.txt
+++ b/examples/websockets/echoclient/CMakeLists.txt
@@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/websockets/echoclient")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS WebSockets)
diff --git a/examples/websockets/echoserver/CMakeLists.txt b/examples/websockets/echoserver/CMakeLists.txt
index 3b7e3ce..c55296f 100644
--- a/examples/websockets/echoserver/CMakeLists.txt
+++ b/examples/websockets/echoserver/CMakeLists.txt
@@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/websockets/echoserver")
 
 find_package(Qt6 COMPONENTS WebSockets)
 
diff --git a/examples/websockets/qmlwebsocketclient/CMakeLists.txt b/examples/websockets/qmlwebsocketclient/CMakeLists.txt
index bad5143..306e871 100644
--- a/examples/websockets/qmlwebsocketclient/CMakeLists.txt
+++ b/examples/websockets/qmlwebsocketclient/CMakeLists.txt
@@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/websockets/qmlwebsocketclient")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
@@ -26,19 +26,19 @@ target_link_libraries(qmlwebsocketclient PUBLIC
     Qt::WebSockets
 )
 
+
 # Resources:
 set(data_resource_files
     "qml/qmlwebsocketclient/main.qml"
 )
 
-QT6_ADD_RESOURCES(qmlwebsocketclient "data"
+qt6_add_resources(qmlwebsocketclient "data"
     PREFIX
         "/"
     FILES
         ${data_resource_files}
 )
 
-
 install(TARGETS qmlwebsocketclient
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/websockets/qmlwebsocketserver/CMakeLists.txt b/examples/websockets/qmlwebsocketserver/CMakeLists.txt
index f7a196b..8f94a16 100644
--- a/examples/websockets/qmlwebsocketserver/CMakeLists.txt
+++ b/examples/websockets/qmlwebsocketserver/CMakeLists.txt
@@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/websockets/qmlwebsocketserver")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
@@ -26,19 +26,19 @@ target_link_libraries(qmlwebsocketserver PUBLIC
     Qt::WebSockets
 )
 
+
 # Resources:
 set(data_resource_files
     "qml/qmlwebsocketserver/main.qml"
 )
 
-QT6_ADD_RESOURCES(qmlwebsocketserver "data"
+qt6_add_resources(qmlwebsocketserver "data"
     PREFIX
         "/"
     FILES
         ${data_resource_files}
 )
 
-
 install(TARGETS qmlwebsocketserver
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/websockets/simplechat/CMakeLists.txt b/examples/websockets/simplechat/CMakeLists.txt
index 367913f..a5240cb 100644
--- a/examples/websockets/simplechat/CMakeLists.txt
+++ b/examples/websockets/simplechat/CMakeLists.txt
@@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/websockets/simplechat")
 
 find_package(Qt6 COMPONENTS WebSockets)
 
diff --git a/examples/websockets/sslechoclient/CMakeLists.txt b/examples/websockets/sslechoclient/CMakeLists.txt
index 039619c..8ba1c8b 100644
--- a/examples/websockets/sslechoclient/CMakeLists.txt
+++ b/examples/websockets/sslechoclient/CMakeLists.txt
@@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/websockets/sslechoclient")
 
 find_package(Qt6 COMPONENTS WebSockets)
 
diff --git a/examples/websockets/sslechoserver/CMakeLists.txt b/examples/websockets/sslechoserver/CMakeLists.txt
index 788aa6d..a196388 100644
--- a/examples/websockets/sslechoserver/CMakeLists.txt
+++ b/examples/websockets/sslechoserver/CMakeLists.txt
@@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/websockets/sslechoserver")
 
 find_package(Qt6 COMPONENTS WebSockets)
 
@@ -21,20 +21,20 @@ target_link_libraries(sslechoserver PUBLIC
     Qt::WebSockets
 )
 
+
 # Resources:
 set(securesocketclient_resource_files
     "localhost.cert"
     "localhost.key"
 )
 
-QT6_ADD_RESOURCES(sslechoserver "securesocketclient"
+qt6_add_resources(sslechoserver "securesocketclient"
     PREFIX
         "/"
     FILES
         ${securesocketclient_resource_files}
 )
 
-
 install(TARGETS sslechoserver
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/src/imports/qmlwebsockets/.prev_CMakeLists.txt b/src/imports/qmlwebsockets/.prev_CMakeLists.txt
index aa1785d..e6da39b 100644
--- a/src/imports/qmlwebsockets/.prev_CMakeLists.txt
+++ b/src/imports/qmlwebsockets/.prev_CMakeLists.txt
@@ -8,6 +8,7 @@ add_qml_module(qmlwebsockets
     URI "QtWebSockets"
     VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
     CLASSNAME QtWebSocketsDeclarativeModule
+    SKIP_TYPE_REGISTRATION
     SOURCES
         qmlwebsockets_plugin.cpp qmlwebsockets_plugin.h
         qqmlwebsocket.cpp qqmlwebsocket.h
diff --git a/src/imports/qmlwebsockets/CMakeLists.txt b/src/imports/qmlwebsockets/CMakeLists.txt
index 228ff38..803f86c 100644
--- a/src/imports/qmlwebsockets/CMakeLists.txt
+++ b/src/imports/qmlwebsockets/CMakeLists.txt
@@ -8,6 +8,7 @@ add_qml_module(qmlwebsockets
     URI "QtWebSockets"
     VERSION "1.0" #special case
     CLASSNAME QtWebSocketsDeclarativeModule
+    SKIP_TYPE_REGISTRATION
     SOURCES
         qmlwebsockets_plugin.cpp qmlwebsockets_plugin.h
         qqmlwebsocket.cpp qqmlwebsocket.h
diff --git a/src/websockets/CMakeLists.txt b/src/websockets/CMakeLists.txt
index 9d87ebb..3d0f212 100644
--- a/src/websockets/CMakeLists.txt
+++ b/src/websockets/CMakeLists.txt
@@ -43,7 +43,7 @@ extend_target(WebSockets CONDITION QT_FEATURE_ssl
 
 #### Keys ignored in scope 3:.:.:websockets.pro:QT_FEATURE_ssl:
 # PRIVATE_HEADERS = "$$PWD/qsslserver_p.h"
-add_qt_docs(
+add_qt_docs(WebSockets
     doc/qtwebsockets.qdocconf
 )
 
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)"