Regenerate projectswip/cmake

Change-Id: Ibdadef34b1b7d4ea98140feed171c409eb8bafde
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

10 files changed, 102 insertions, 19 deletions

diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt
new file mode 100644
index 0000000..bba8c8d
--- /dev/null
+++ b/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qtwebchannel.pro.
+
+cmake_minimum_required(VERSION 3.15.0)
+
+project(QtWebChannel
+    VERSION 6.0.0
+    DESCRIPTION "Qt WebChannel 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)
+
+qt_build_repo()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed69eb2..ce62c3d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,5 @@
+# Generated from qtwebchannel.pro.
+
 cmake_minimum_required(VERSION 3.15.0)
 
 project(QtWebChannel
@@ -7,7 +9,7 @@ project(QtWebChannel
     LANGUAGES CXX C
 )
 
-find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core)
-find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Quick Test QuickTest WebSockets)
+find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) # special case
+find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Quick Test QuickTest WebSockets) # special case
 
 qt_build_repo()
diff --git a/examples/webchannel/chatserver-cpp/CMakeLists.txt b/examples/webchannel/chatserver-cpp/CMakeLists.txt
index afca841..3a3a2c9 100644
--- a/examples/webchannel/chatserver-cpp/CMakeLists.txt
+++ b/examples/webchannel/chatserver-cpp/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/webchannel/chatserver-cpp")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS WebSockets)
diff --git a/examples/webchannel/standalone/.prev_CMakeLists.txt b/examples/webchannel/standalone/.prev_CMakeLists.txt
new file mode 100644
index 0000000..a170cb6
--- /dev/null
+++ b/examples/webchannel/standalone/.prev_CMakeLists.txt
@@ -0,0 +1,44 @@
+# Generated from standalone.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(standalone LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/webchannel/standalone")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS WebChannel)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS WebSockets)
+
+add_qt_gui_executable(standalone
+    ../shared/websocketclientwrapper.cpp ../shared/websocketclientwrapper.h
+    ../shared/websockettransport.cpp ../shared/websockettransport.h
+    core.h
+    dialog.cpp dialog.h dialog.ui
+    main.cpp
+)
+target_compile_definitions(standalone PUBLIC
+    ${CMAKE_CURRENT_BINARY_DIR}"\\\"\""
+    BUILD_DIR="\"
+)
+
+target_link_libraries(standalone PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::WebChannel
+    Qt::WebSockets
+    Qt::Widgets
+)
+
+install(TARGETS standalone
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/webchannel/standalone/CMakeLists.txt b/examples/webchannel/standalone/CMakeLists.txt
index c915378..78977cd 100644
--- a/examples/webchannel/standalone/CMakeLists.txt
+++ b/examples/webchannel/standalone/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/webchannel/standalone")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
diff --git a/src/imports/webchannel/.prev_CMakeLists.txt b/src/imports/webchannel/.prev_CMakeLists.txt
new file mode 100644
index 0000000..a616eb8
--- /dev/null
+++ b/src/imports/webchannel/.prev_CMakeLists.txt
@@ -0,0 +1,26 @@
+# Generated from webchannel.pro.
+
+#####################################################################
+## webchannel Plugin:
+#####################################################################
+
+qt_add_qml_module(webchannel
+    URI "QtWebChannel"
+    VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
+    CLASSNAME QWebChannelPlugin
+    SKIP_TYPE_REGISTRATION
+    SOURCES
+        plugin.cpp
+    INCLUDE_DIRECTORIES
+        ../../webchannel
+    LIBRARIES
+        Qt::WebChannelPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Quick
+        Qt::WebChannel
+)
+
+#### Keys ignored in scope 1:.:.:webchannel.pro:<TRUE>:
+# IMPORT_VERSION = "1.$$QT_MINOR_VERSION"
+# TARGETPATH = "QtWebChannel"
diff --git a/src/imports/webchannel/CMakeLists.txt b/src/imports/webchannel/CMakeLists.txt
index fa48b81..d4986a9 100644
--- a/src/imports/webchannel/CMakeLists.txt
+++ b/src/imports/webchannel/CMakeLists.txt
@@ -4,10 +4,11 @@
 ## webchannel Plugin:
 #####################################################################
 
-add_qml_module(declarative_webchannel # special case
+qt_add_qml_module(declarative_webchannel # special case
     URI "QtWebChannel"
     VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
     CLASSNAME QWebChannelPlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
     INCLUDE_DIRECTORIES
@@ -23,4 +24,3 @@ add_qml_module(declarative_webchannel # special case
 #### Keys ignored in scope 1:.:.:webchannel.pro:<TRUE>:
 # IMPORT_VERSION = "1.$$QT_MINOR_VERSION"
 # TARGETPATH = "QtWebChannel"
-# _LOADED = "qml_plugin"
diff --git a/src/webchannel/CMakeLists.txt b/src/webchannel/CMakeLists.txt
index 4f7f940..45c0373 100644
--- a/src/webchannel/CMakeLists.txt
+++ b/src/webchannel/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## WebChannel Module:
 #####################################################################
 
-add_qt_module(WebChannel
+qt_add_module(WebChannel
     SOURCES
         qmetaobjectpublisher.cpp qmetaobjectpublisher_p.h
         qwebchannel.cpp qwebchannel.h qwebchannel_p.h
@@ -27,7 +27,7 @@ set(resources_resource_files
 
 set_source_files_properties(${resources_resource_files} PROPERTIES QT_SKIP_QUICKCOMPILER 1)
 
-add_qt_resource(WebChannel "resources"
+qt_add_resource(WebChannel "resources"
     PREFIX
         "/qtwebchannel/"
     FILES
@@ -37,12 +37,11 @@ add_qt_resource(WebChannel "resources"
 
 #### Keys ignored in scope 1:.:.:webchannel.pro:<TRUE>:
 # OTHER_FILES = "qwebchannel.js"
-# _LOADED = "qt_module"
 
 ## Scopes:
 #####################################################################
 
-extend_target(WebChannel CONDITION TARGET Qt::Qml
+qt_extend_target(WebChannel CONDITION TARGET Qt::Qml
     SOURCES
         qqmlwebchannel.cpp
         qqmlwebchannelattached.cpp
@@ -54,11 +53,11 @@ extend_target(WebChannel CONDITION TARGET Qt::Qml
 # PRIVATE_HEADERS = "qqmlwebchannelattached_p.h"
 # PUBLIC_HEADERS = "qqmlwebchannel.h"
 
-extend_target(WebChannel CONDITION NOT TARGET Qt::Qml
+qt_extend_target(WebChannel CONDITION NOT TARGET Qt::Qml
     DEFINES
         QT_NO_JSVALUE
 )
-add_qt_docs(
+qt_add_docs(WebChannel
     doc/qtwebchannel.qdocconf
 )
 
diff --git a/tests/auto/qml/CMakeLists.txt b/tests/auto/qml/CMakeLists.txt
index e49bd8c..3b6013f 100644
--- a/tests/auto/qml/CMakeLists.txt
+++ b/tests/auto/qml/CMakeLists.txt
@@ -5,14 +5,12 @@
 #####################################################################
 
 # Collect test data
-
 file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "data/*")
+    data/*)
 list(APPEND test_data ${test_data_glob})
 
-add_qt_test(qml
-    GUI
+qt_add_test(qml
     QMLTEST
     QML_IMPORTPATH
         "${CMAKE_CURRENT_BINARY_DIR}/../../../qml"
diff --git a/tests/auto/webchannel/CMakeLists.txt b/tests/auto/webchannel/CMakeLists.txt
index aa040f8..1f7d734 100644
--- a/tests/auto/webchannel/CMakeLists.txt
+++ b/tests/auto/webchannel/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## tst_webchannel Test:
 #####################################################################
 
-add_qt_test(tst_webchannel
-    GUI
+qt_add_test(tst_webchannel
     SOURCES
         tst_webchannel.cpp tst_webchannel.h
     INCLUDE_DIRECTORIES
@@ -20,7 +19,7 @@ add_qt_test(tst_webchannel
 ## Scopes:
 #####################################################################
 
-extend_target(tst_webchannel CONDITION TARGET Qt::Qml
+qt_extend_target(tst_webchannel CONDITION TARGET Qt::Qml
     DEFINES
         WEBCHANNEL_TESTS_CAN_USE_JS_ENGINE
     PUBLIC_LIBRARIES