Regenerate projects

Change-Id: Ie454c70664c94743c0323d3d5fb8d4d7f224f3f1
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

15 files changed, 20 insertions, 23 deletions

diff --git a/examples/websockets/qmlwebsocketclient/CMakeLists.txt b/examples/websockets/qmlwebsocketclient/CMakeLists.txt
index 306e871..eb67d6e 100644
--- a/examples/websockets/qmlwebsocketclient/CMakeLists.txt
+++ b/examples/websockets/qmlwebsocketclient/CMakeLists.txt
@@ -16,7 +16,7 @@ find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Quick)
 find_package(Qt6 COMPONENTS WebSockets)
 
-add_qt_gui_executable(qmlwebsocketclient
+add_executable(qmlwebsocketclient
     main.cpp
 )
 target_link_libraries(qmlwebsocketclient PUBLIC
diff --git a/examples/websockets/qmlwebsocketserver/CMakeLists.txt b/examples/websockets/qmlwebsocketserver/CMakeLists.txt
index 8f94a16..7da6d4f 100644
--- a/examples/websockets/qmlwebsocketserver/CMakeLists.txt
+++ b/examples/websockets/qmlwebsocketserver/CMakeLists.txt
@@ -16,7 +16,7 @@ find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Quick)
 find_package(Qt6 COMPONENTS WebSockets)
 
-add_qt_gui_executable(qmlwebsocketserver
+add_executable(qmlwebsocketserver
     main.cpp
 )
 target_link_libraries(qmlwebsocketserver PUBLIC
diff --git a/src/imports/qmlwebsockets/.prev_CMakeLists.txt b/src/imports/qmlwebsockets/.prev_CMakeLists.txt
index e6da39b..a18d4d0 100644
--- a/src/imports/qmlwebsockets/.prev_CMakeLists.txt
+++ b/src/imports/qmlwebsockets/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmlwebsockets Plugin:
 #####################################################################
 
-add_qml_module(qmlwebsockets
+qt_add_qml_module(qmlwebsockets
     URI "QtWebSockets"
     VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
     CLASSNAME QtWebSocketsDeclarativeModule
@@ -26,4 +26,3 @@ add_qml_module(qmlwebsockets
 # IMPORT_VERSION = "1.$$QT_MINOR_VERSION"
 # OTHER_FILES = "qmldir"
 # TARGETPATH = "QtWebSockets"
-# _LOADED = "qml_plugin"
diff --git a/src/imports/qmlwebsockets/CMakeLists.txt b/src/imports/qmlwebsockets/CMakeLists.txt
index 803f86c..29f2eb6 100644
--- a/src/imports/qmlwebsockets/CMakeLists.txt
+++ b/src/imports/qmlwebsockets/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qmlwebsockets Plugin:
 #####################################################################
 
-add_qml_module(qmlwebsockets
+qt_add_qml_module(qmlwebsockets
     URI "QtWebSockets"
     VERSION "1.0" #special case
     CLASSNAME QtWebSocketsDeclarativeModule
@@ -26,4 +26,3 @@ add_qml_module(qmlwebsockets
 # IMPORT_VERSION = "1.$$QT_MINOR_VERSION"
 # OTHER_FILES = "qmldir"
 # TARGETPATH = "QtWebSockets"
-# _LOADED = "qml_plugin"
diff --git a/src/websockets/CMakeLists.txt b/src/websockets/CMakeLists.txt
index 3d0f212..1f0f705 100644
--- a/src/websockets/CMakeLists.txt
+++ b/src/websockets/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## WebSockets Module:
 #####################################################################
 
-add_qt_module(WebSockets
+qt_add_module(WebSockets
     SOURCES
         qdefaultmaskgenerator_p.cpp qdefaultmaskgenerator_p.h
         qmaskgenerator.cpp qmaskgenerator.h
@@ -26,24 +26,23 @@ add_qt_module(WebSockets
 
 #### Keys ignored in scope 1:.:.:websockets.pro:<TRUE>:
 # OTHER_FILES = "doc/src/*.qdoc" "doc/snippets/*.cpp" "doc/qtwebsockets.qdocconf"
-# _LOADED = "qt_module"
 
 ## Scopes:
 #####################################################################
 
-extend_target(WebSockets CONDITION WASM
+qt_extend_target(WebSockets CONDITION WASM
     SOURCES
         qwebsocket_wasm_p.cpp
 )
 
-extend_target(WebSockets CONDITION QT_FEATURE_ssl
+qt_extend_target(WebSockets CONDITION QT_FEATURE_ssl
     SOURCES
         qsslserver.cpp
 )
 
 #### Keys ignored in scope 3:.:.:websockets.pro:QT_FEATURE_ssl:
 # PRIVATE_HEADERS = "$$PWD/qsslserver_p.h"
-add_qt_docs(WebSockets
+qt_add_docs(WebSockets
     doc/qtwebsockets.qdocconf
 )
 
diff --git a/tests/auto/qml/qmlwebsockets/CMakeLists.txt b/tests/auto/qml/qmlwebsockets/CMakeLists.txt
index 753e254..ca1557c 100644
--- a/tests/auto/qml/qmlwebsockets/CMakeLists.txt
+++ b/tests/auto/qml/qmlwebsockets/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qmlwebsockets Test:
 #####################################################################
 
-add_qt_test(tst_qmlwebsockets
+qt_add_test(tst_qmlwebsockets
     QMLTEST
     SOURCES
         tst_qmlwebsockets.cpp
diff --git a/tests/auto/websockets/dataprocessor/CMakeLists.txt b/tests/auto/websockets/dataprocessor/CMakeLists.txt
index c1ec133..7f17f97 100644
--- a/tests/auto/websockets/dataprocessor/CMakeLists.txt
+++ b/tests/auto/websockets/dataprocessor/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 ## tst_dataprocessor Test:
 #####################################################################
 
-add_qt_test(tst_dataprocessor
+qt_add_test(tst_dataprocessor
     SOURCES
         tst_dataprocessor.cpp
     LIBRARIES
diff --git a/tests/auto/websockets/handshakerequest/CMakeLists.txt b/tests/auto/websockets/handshakerequest/CMakeLists.txt
index e177988..634e462 100644
--- a/tests/auto/websockets/handshakerequest/CMakeLists.txt
+++ b/tests/auto/websockets/handshakerequest/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 ## tst_handshakerequest Test:
 #####################################################################
 
-add_qt_test(tst_handshakerequest
+qt_add_test(tst_handshakerequest
     SOURCES
         tst_handshakerequest.cpp
     LIBRARIES
diff --git a/tests/auto/websockets/handshakeresponse/CMakeLists.txt b/tests/auto/websockets/handshakeresponse/CMakeLists.txt
index e22716c..84cdebf 100644
--- a/tests/auto/websockets/handshakeresponse/CMakeLists.txt
+++ b/tests/auto/websockets/handshakeresponse/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 ## tst_handshakeresponse Test:
 #####################################################################
 
-add_qt_test(tst_handshakeresponse
+qt_add_test(tst_handshakeresponse
     SOURCES
         tst_handshakeresponse.cpp
     LIBRARIES
diff --git a/tests/auto/websockets/qdefaultmaskgenerator/CMakeLists.txt b/tests/auto/websockets/qdefaultmaskgenerator/CMakeLists.txt
index 8761565..bd473af 100644
--- a/tests/auto/websockets/qdefaultmaskgenerator/CMakeLists.txt
+++ b/tests/auto/websockets/qdefaultmaskgenerator/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 ## tst_defaultmaskgenerator Test:
 #####################################################################
 
-add_qt_test(tst_defaultmaskgenerator
+qt_add_test(tst_defaultmaskgenerator
     SOURCES
         tst_defaultmaskgenerator.cpp
     LIBRARIES
diff --git a/tests/auto/websockets/qwebsocket/CMakeLists.txt b/tests/auto/websockets/qwebsocket/CMakeLists.txt
index 68282a9..ef9a63b 100644
--- a/tests/auto/websockets/qwebsocket/CMakeLists.txt
+++ b/tests/auto/websockets/qwebsocket/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qwebsocket Test:
 #####################################################################
 
-add_qt_test(tst_qwebsocket
+qt_add_test(tst_qwebsocket
     SOURCES
         tst_qwebsocket.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/websockets/qwebsocketcorsauthenticator/CMakeLists.txt b/tests/auto/websockets/qwebsocketcorsauthenticator/CMakeLists.txt
index 35e4f95..59045da 100644
--- a/tests/auto/websockets/qwebsocketcorsauthenticator/CMakeLists.txt
+++ b/tests/auto/websockets/qwebsocketcorsauthenticator/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qwebsocketcorsauthenticator Test:
 #####################################################################
 
-add_qt_test(tst_qwebsocketcorsauthenticator
+qt_add_test(tst_qwebsocketcorsauthenticator
     SOURCES
         tst_qwebsocketcorsauthenticator.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/websockets/qwebsocketserver/CMakeLists.txt b/tests/auto/websockets/qwebsocketserver/CMakeLists.txt
index 7a5cdfa..9b2eca8 100644
--- a/tests/auto/websockets/qwebsocketserver/CMakeLists.txt
+++ b/tests/auto/websockets/qwebsocketserver/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qwebsocketserver Test:
 #####################################################################
 
-add_qt_test(tst_qwebsocketserver
+qt_add_test(tst_qwebsocketserver
     SOURCES
         tst_qwebsocketserver.cpp
     PUBLIC_LIBRARIES
@@ -23,7 +23,7 @@ set(qwebsocketshared_resource_files
     "localhost.key"
 )
 
-add_qt_resource(tst_qwebsocketserver "qwebsocketshared"
+qt_add_resource(tst_qwebsocketserver "qwebsocketshared"
     PREFIX
         "/"
     BASE
@@ -39,7 +39,7 @@ add_qt_resource(tst_qwebsocketserver "qwebsocketshared"
 ## Scopes:
 #####################################################################
 
-extend_target(tst_qwebsocketserver CONDITION boot2qt
+qt_extend_target(tst_qwebsocketserver CONDITION boot2qt
     DEFINES
         SHOULD_CHECK_SYSCALL_SUPPORT
 )
diff --git a/tests/auto/websockets/websocketframe/CMakeLists.txt b/tests/auto/websockets/websocketframe/CMakeLists.txt
index 565c106..bcbccf2 100644
--- a/tests/auto/websockets/websocketframe/CMakeLists.txt
+++ b/tests/auto/websockets/websocketframe/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 ## tst_websocketframe Test:
 #####################################################################
 
-add_qt_test(tst_websocketframe
+qt_add_test(tst_websocketframe
     SOURCES
         tst_websocketframe.cpp
     LIBRARIES
diff --git a/tests/auto/websockets/websocketprotocol/CMakeLists.txt b/tests/auto/websockets/websocketprotocol/CMakeLists.txt
index 66a011f..cd559b4 100644
--- a/tests/auto/websockets/websocketprotocol/CMakeLists.txt
+++ b/tests/auto/websockets/websocketprotocol/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 ## tst_websocketprotocol Test:
 #####################################################################
 
-add_qt_test(tst_websocketprotocol
+qt_add_test(tst_websocketprotocol
     SOURCES
         tst_websocketprotocol.cpp
     LIBRARIES