Regenerate projectswip/cmake

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

17 files changed, 31 insertions, 40 deletions

diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt
index 9018bf4..1bdd4e0 100644
--- a/.prev_CMakeLists.txt
+++ b/.prev_CMakeLists.txt
@@ -11,4 +11,5 @@ project(QtCoap
 
 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/examples/coap/consolecoapclient/CMakeLists.txt b/examples/coap/consolecoapclient/CMakeLists.txt
index 466012e..8cb6a34 100644
--- a/examples/coap/consolecoapclient/CMakeLists.txt
+++ b/examples/coap/consolecoapclient/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/coap/consolecoapclient")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Network)
diff --git a/examples/coap/quickmulticastclient/CMakeLists.txt b/examples/coap/quickmulticastclient/CMakeLists.txt
index 5c9a28c..d9b4db5 100644
--- a/examples/coap/quickmulticastclient/CMakeLists.txt
+++ b/examples/coap/quickmulticastclient/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/coap/quickmulticastclient")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
@@ -24,6 +24,7 @@ add_qt_gui_executable(quickmulticastclient
 target_compile_definitions(quickmulticastclient PUBLIC
     QT_DEPRECATED_WARNINGS
 )
+
 target_link_libraries(quickmulticastclient PUBLIC
     Qt::Coap
     Qt::Core
@@ -32,19 +33,19 @@ target_link_libraries(quickmulticastclient PUBLIC
     Qt::Quick
 )
 
+
 # Resources:
 set(qml_resource_files
     "main.qml"
 )
 
-QT6_ADD_RESOURCES(quickmulticastclient "qml"
+qt6_add_resources(quickmulticastclient "qml"
     PREFIX
         "/"
     FILES
         ${qml_resource_files}
 )
 
-
 install(TARGETS quickmulticastclient
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/coap/quicksecureclient/CMakeLists.txt b/examples/coap/quicksecureclient/CMakeLists.txt
index 4be495a..71d21d4 100644
--- a/examples/coap/quicksecureclient/CMakeLists.txt
+++ b/examples/coap/quicksecureclient/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/coap/quicksecureclient")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
@@ -24,6 +24,7 @@ add_qt_gui_executable(quicksecureclient
 target_compile_definitions(quicksecureclient PUBLIC
     QT_DEPRECATED_WARNINGS
 )
+
 target_link_libraries(quicksecureclient PUBLIC
     Qt::Coap
     Qt::Core
@@ -32,20 +33,20 @@ target_link_libraries(quicksecureclient PUBLIC
     Qt::Quick
 )
 
+
 # Resources:
 set(qml_resource_files
     "FilePicker.qml"
     "main.qml"
 )
 
-QT6_ADD_RESOURCES(quicksecureclient "qml"
+qt6_add_resources(quicksecureclient "qml"
     PREFIX
         "/"
     FILES
         ${qml_resource_files}
 )
 
-
 install(TARGETS quicksecureclient
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/coap/simplecoapclient/CMakeLists.txt b/examples/coap/simplecoapclient/CMakeLists.txt
index f2b0671..db046a4 100644
--- a/examples/coap/simplecoapclient/CMakeLists.txt
+++ b/examples/coap/simplecoapclient/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/coap/simplecoapclient")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
@@ -25,6 +25,7 @@ add_qt_gui_executable(simplecoapclient
 target_compile_definitions(simplecoapclient PUBLIC
     QT_DEPRECATED_WARNINGS
 )
+
 target_link_libraries(simplecoapclient PUBLIC
     Qt::Coap
     Qt::Core
diff --git a/src/coap/CMakeLists.txt b/src/coap/CMakeLists.txt
index 6dab10c..30893b3 100644
--- a/src/coap/CMakeLists.txt
+++ b/src/coap/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Coap Module:
 #####################################################################
 
-add_qt_module(Coap
+qt_add_module(Coap
     SOURCES
         qcoapclient.cpp qcoapclient.h qcoapclient_p.h
         qcoapconnection.cpp qcoapconnection_p.h
@@ -28,10 +28,7 @@ add_qt_module(Coap
     PUBLIC_LIBRARIES
         Qt::Core
 )
-
-#### Keys ignored in scope 1:.:.:coap.pro:<TRUE>:
-# _LOADED = "qt_module"
-add_qt_docs(
+qt_add_docs(Coap
     doc/qtcoap.qdocconf
 )
 
diff --git a/tests/auto/qcoapclient/.prev_CMakeLists.txt b/tests/auto/qcoapclient/.prev_CMakeLists.txt
index 517a7c0..65a99f5 100644
--- a/tests/auto/qcoapclient/.prev_CMakeLists.txt
+++ b/tests/auto/qcoapclient/.prev_CMakeLists.txt
@@ -4,8 +4,7 @@
 ## qcoapclient Test:
 #####################################################################
 
-add_qt_test(qcoapclient
-    GUI
+qt_add_test(qcoapclient
     SOURCES
         ../coapnetworksettings.h
         tst_qcoapclient.cpp
@@ -23,7 +22,7 @@ add_qt_test(qcoapclient
 ## Scopes:
 #####################################################################
 
-extend_target(qcoapclient CONDITION NOT COAP_TEST_SERVER_IP_ISEMPTY
+qt_extend_target(qcoapclient CONDITION NOT COAP_TEST_SERVER_IP_ISEMPTY
     DEFINES
-        COAP_TEST_SERVER_IP=\\\"$$(COAP_TEST_SERVER_IP)\\\"
+        COAP_TEST_SERVER_IP=\\\"$ENV{COAP_TEST_SERVER_IP}\\\"
 )
diff --git a/tests/auto/qcoapclient/CMakeLists.txt b/tests/auto/qcoapclient/CMakeLists.txt
index 2a92bae..7e92725 100644
--- a/tests/auto/qcoapclient/CMakeLists.txt
+++ b/tests/auto/qcoapclient/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qcoapclient Test:
 #####################################################################
 
-add_qt_test(qcoapclient
+qt_add_test(qcoapclient
     EXCEPTIONS # special case
     GUI
     SOURCES
@@ -25,7 +25,7 @@ add_qt_test(qcoapclient
 #####################################################################
 
 # special case begin
-extend_target(qcoapclient CONDITION DEFINED ENV{COAP_TEST_SERVER_IP}
+qt_extend_target(qcoapclient CONDITION DEFINED ENV{COAP_TEST_SERVER_IP}
     DEFINES
         COAP_TEST_SERVER_IP=\\\"$ENV{COAP_TEST_SERVER_IP}\\\"
 )
diff --git a/tests/auto/qcoapinternalreply/CMakeLists.txt b/tests/auto/qcoapinternalreply/CMakeLists.txt
index 04ccd66..8106aeb 100644
--- a/tests/auto/qcoapinternalreply/CMakeLists.txt
+++ b/tests/auto/qcoapinternalreply/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## qcoapinternalreply Test:
 #####################################################################
 
-add_qt_test(qcoapinternalreply
-    GUI
+qt_add_test(qcoapinternalreply
     SOURCES
         tst_qcoapinternalreply.cpp
     LIBRARIES
diff --git a/tests/auto/qcoapinternalrequest/CMakeLists.txt b/tests/auto/qcoapinternalrequest/CMakeLists.txt
index 5a3c3f0..b33c652 100644
--- a/tests/auto/qcoapinternalrequest/CMakeLists.txt
+++ b/tests/auto/qcoapinternalrequest/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## qcoapinternalrequest Test:
 #####################################################################
 
-add_qt_test(qcoapinternalrequest
-    GUI
+qt_add_test(qcoapinternalrequest
     SOURCES
         tst_qcoapinternalrequest.cpp
     LIBRARIES
diff --git a/tests/auto/qcoapmessage/CMakeLists.txt b/tests/auto/qcoapmessage/CMakeLists.txt
index 8862be7..0d0f713 100644
--- a/tests/auto/qcoapmessage/CMakeLists.txt
+++ b/tests/auto/qcoapmessage/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## qcoapmessage Test:
 #####################################################################
 
-add_qt_test(qcoapmessage
-    GUI
+qt_add_test(qcoapmessage
     SOURCES
         tst_qcoapmessage.cpp
     LIBRARIES
diff --git a/tests/auto/qcoapoption/CMakeLists.txt b/tests/auto/qcoapoption/CMakeLists.txt
index 25b3948..ee18de8 100644
--- a/tests/auto/qcoapoption/CMakeLists.txt
+++ b/tests/auto/qcoapoption/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## qcoapoption Test:
 #####################################################################
 
-add_qt_test(qcoapoption
-    GUI
+qt_add_test(qcoapoption
     SOURCES
         tst_qcoapoption.cpp
     LIBRARIES
diff --git a/tests/auto/qcoapqudpconnection/.prev_CMakeLists.txt b/tests/auto/qcoapqudpconnection/.prev_CMakeLists.txt
index d3e2df5..95be340 100644
--- a/tests/auto/qcoapqudpconnection/.prev_CMakeLists.txt
+++ b/tests/auto/qcoapqudpconnection/.prev_CMakeLists.txt
@@ -4,8 +4,7 @@
 ## qcoapqudpconnection Test:
 #####################################################################
 
-add_qt_test(qcoapqudpconnection
-    GUI
+qt_add_test(qcoapqudpconnection
     SOURCES
         ../coapnetworksettings.h
         tst_qcoapqudpconnection.cpp
@@ -23,7 +22,7 @@ add_qt_test(qcoapqudpconnection
 ## Scopes:
 #####################################################################
 
-extend_target(qcoapqudpconnection CONDITION NOT COAP_TEST_SERVER_IP_ISEMPTY
+qt_extend_target(qcoapqudpconnection CONDITION NOT COAP_TEST_SERVER_IP_ISEMPTY
     DEFINES
-        COAP_TEST_SERVER_IP=\\\"$$(COAP_TEST_SERVER_IP)\\\"
+        COAP_TEST_SERVER_IP=\\\"$ENV{COAP_TEST_SERVER_IP}\\\"
 )
diff --git a/tests/auto/qcoapqudpconnection/CMakeLists.txt b/tests/auto/qcoapqudpconnection/CMakeLists.txt
index a460579..b415301 100644
--- a/tests/auto/qcoapqudpconnection/CMakeLists.txt
+++ b/tests/auto/qcoapqudpconnection/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## qcoapqudpconnection Test:
 #####################################################################
 
-add_qt_test(qcoapqudpconnection
-    GUI
+qt_add_test(qcoapqudpconnection
     SOURCES
         ../coapnetworksettings.h
         tst_qcoapqudpconnection.cpp
@@ -24,7 +23,7 @@ add_qt_test(qcoapqudpconnection
 #####################################################################
 
 # special case begin
-extend_target(qcoapqudpconnection CONDITION DEFINED ENV{COAP_TEST_SERVER_IP}
+qt_extend_target(qcoapqudpconnection CONDITION DEFINED ENV{COAP_TEST_SERVER_IP}
     DEFINES
         COAP_TEST_SERVER_IP=\\\"$ENV{COAP_TEST_SERVER_IP}\\\"
 )
diff --git a/tests/auto/qcoapreply/CMakeLists.txt b/tests/auto/qcoapreply/CMakeLists.txt
index 23d9dfa..22d9210 100644
--- a/tests/auto/qcoapreply/CMakeLists.txt
+++ b/tests/auto/qcoapreply/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## qcoapreply Test:
 #####################################################################
 
-add_qt_test(qcoapreply
-    GUI
+qt_add_test(qcoapreply
     SOURCES
         tst_qcoapreply.cpp
     LIBRARIES
diff --git a/tests/auto/qcoaprequest/CMakeLists.txt b/tests/auto/qcoaprequest/CMakeLists.txt
index 0921f1b..08b2ee8 100644
--- a/tests/auto/qcoaprequest/CMakeLists.txt
+++ b/tests/auto/qcoaprequest/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## qcoaprequest Test:
 #####################################################################
 
-add_qt_test(qcoaprequest
-    GUI
+qt_add_test(qcoaprequest
     SOURCES
         tst_qcoaprequest.cpp
     LIBRARIES
diff --git a/tests/auto/qcoapresource/CMakeLists.txt b/tests/auto/qcoapresource/CMakeLists.txt
index 8241196..fcdf254 100644
--- a/tests/auto/qcoapresource/CMakeLists.txt
+++ b/tests/auto/qcoapresource/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## qcoapresource Test:
 #####################################################################
 
-add_qt_test(qcoapresource
-    GUI
+qt_add_test(qcoapresource
     SOURCES
         tst_qcoapresource.cpp
     LIBRARIES