Regenerate projectswip/cmake

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

21 files changed, 169 insertions, 40 deletions

diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt
index 929506f..6b95eaf 100644
--- a/.prev_CMakeLists.txt
+++ b/.prev_CMakeLists.txt
@@ -16,25 +16,20 @@ if(INTEGRITY)
     message(NOTICE "Skipping the build as the condition \"NOT INTEGRITY\" is not met.")
     return()
 endif()
-
 if(VXWORKS)
     message(NOTICE "Skipping the build as the condition \"NOT VXWORKS\" is not met.")
     return()
 endif()
-
 if(WINRT)
     message(NOTICE "Skipping the build as the condition \"NOT WINRT\" is not met.")
     return()
 endif()
-
 if(APPLE_UIKIT)
     message(NOTICE "Skipping the build as the condition \"NOT APPLE_UIKIT\" is not met.")
     return()
 endif()
-
 if(EMSCRIPTEN)
     message(NOTICE "Skipping the build as the condition \"NOT EMSCRIPTEN\" is not met.")
     return()
 endif()
-
 qt_build_repo()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7edaa58..0cc593b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,25 +16,20 @@ if(INTEGRITY)
     message(NOTICE "Skipping the build as the condition \"NOT INTEGRITY\" is not met.")
     return()
 endif()
-
 if(VXWORKS)
     message(NOTICE "Skipping the build as the condition \"NOT VXWORKS\" is not met.")
     return()
 endif()
-
 if(WINRT)
     message(NOTICE "Skipping the build as the condition \"NOT WINRT\" is not met.")
     return()
 endif()
-
 if(APPLE_UIKIT)
     message(NOTICE "Skipping the build as the condition \"NOT APPLE_UIKIT\" is not met.")
     return()
 endif()
-
 if(EMSCRIPTEN)
     message(NOTICE "Skipping the build as the condition \"NOT EMSCRIPTEN\" is not met.")
     return()
 endif()
-
 qt_build_repo()
diff --git a/examples/serialport/blockingmaster/CMakeLists.txt b/examples/serialport/blockingmaster/CMakeLists.txt
index dbcd935..da9524b 100644
--- a/examples/serialport/blockingmaster/CMakeLists.txt
+++ b/examples/serialport/blockingmaster/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/serialport/blockingmaster")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
diff --git a/examples/serialport/blockingslave/CMakeLists.txt b/examples/serialport/blockingslave/CMakeLists.txt
index 4b63a3c..edb7450 100644
--- a/examples/serialport/blockingslave/CMakeLists.txt
+++ b/examples/serialport/blockingslave/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/serialport/blockingslave")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
diff --git a/examples/serialport/cenumerator/CMakeLists.txt b/examples/serialport/cenumerator/CMakeLists.txt
index 6e53189..04359c6 100644
--- a/examples/serialport/cenumerator/CMakeLists.txt
+++ b/examples/serialport/cenumerator/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/serialport/cenumerator")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS SerialPort)
diff --git a/examples/serialport/creaderasync/CMakeLists.txt b/examples/serialport/creaderasync/CMakeLists.txt
index 10f2690..1c46533 100644
--- a/examples/serialport/creaderasync/CMakeLists.txt
+++ b/examples/serialport/creaderasync/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/serialport/creaderasync")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS SerialPort)
diff --git a/examples/serialport/creadersync/CMakeLists.txt b/examples/serialport/creadersync/CMakeLists.txt
index a00386e..8648013 100644
--- a/examples/serialport/creadersync/CMakeLists.txt
+++ b/examples/serialport/creadersync/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/serialport/creadersync")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS SerialPort)
diff --git a/examples/serialport/cwriterasync/CMakeLists.txt b/examples/serialport/cwriterasync/CMakeLists.txt
index 0a0fc1e..c7e8a8e 100644
--- a/examples/serialport/cwriterasync/CMakeLists.txt
+++ b/examples/serialport/cwriterasync/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/serialport/cwriterasync")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS SerialPort)
diff --git a/examples/serialport/cwritersync/CMakeLists.txt b/examples/serialport/cwritersync/CMakeLists.txt
index 7f31b78..231ad2e 100644
--- a/examples/serialport/cwritersync/CMakeLists.txt
+++ b/examples/serialport/cwritersync/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/serialport/cwritersync")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS SerialPort)
diff --git a/examples/serialport/enumerator/CMakeLists.txt b/examples/serialport/enumerator/CMakeLists.txt
index 7fc5358..10019a8 100644
--- a/examples/serialport/enumerator/CMakeLists.txt
+++ b/examples/serialport/enumerator/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/serialport/enumerator")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
diff --git a/examples/serialport/master/CMakeLists.txt b/examples/serialport/master/CMakeLists.txt
index 5b36d92..e14443a 100644
--- a/examples/serialport/master/CMakeLists.txt
+++ b/examples/serialport/master/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/serialport/master")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
@@ -23,6 +23,13 @@ target_link_libraries(master PUBLIC
     Qt::Gui
 )
 
+if((QT_MAJOR_VERSION GREATER 4))
+    target_link_libraries(master PUBLIC
+        Qt::SerialPort
+        Qt::Widgets
+    )
+endif()
+
 install(TARGETS master
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/serialport/slave/CMakeLists.txt b/examples/serialport/slave/CMakeLists.txt
index ce86337..ca819f4 100644
--- a/examples/serialport/slave/CMakeLists.txt
+++ b/examples/serialport/slave/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/serialport/slave")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
@@ -23,6 +23,13 @@ target_link_libraries(slave PUBLIC
     Qt::Gui
 )
 
+if((QT_MAJOR_VERSION GREATER 4))
+    target_link_libraries(slave PUBLIC
+        Qt::SerialPort
+        Qt::Widgets
+    )
+endif()
+
 install(TARGETS slave
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/serialport/terminal/CMakeLists.txt b/examples/serialport/terminal/CMakeLists.txt
index 0130a0a..87d32aa 100644
--- a/examples/serialport/terminal/CMakeLists.txt
+++ b/examples/serialport/terminal/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/serialport/terminal")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
@@ -29,6 +29,7 @@ target_link_libraries(terminal PUBLIC
     Qt::Widgets
 )
 
+
 # Resources:
 set(terminal_resource_files
     "images/application-exit.png"
@@ -38,14 +39,13 @@ set(terminal_resource_files
     "images/settings.png"
 )
 
-QT6_ADD_RESOURCES(terminal "terminal"
+qt6_add_resources(terminal "terminal"
     PREFIX
         "/"
     FILES
         ${terminal_resource_files}
 )
 
-
 install(TARGETS terminal
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/src/serialport/.prev_CMakeLists.txt b/src/serialport/.prev_CMakeLists.txt
new file mode 100644
index 0000000..bf979b7
--- /dev/null
+++ b/src/serialport/.prev_CMakeLists.txt
@@ -0,0 +1,70 @@
+# Generated from serialport.pro.
+
+#####################################################################
+## SerialPort Module:
+#####################################################################
+
+qt_add_module(SerialPort
+    SOURCES
+        qserialport.cpp qserialport.h qserialport_p.h
+        qserialportglobal.h
+        qserialportinfo.cpp qserialportinfo.h qserialportinfo_p.h
+    INCLUDE_DIRECTORIES
+        ${CMAKE_CURRENT_SOURCE_DIR}
+    LIBRARIES
+        Qt::CorePrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+)
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(SerialPort CONDITION config_ntddmodm
+    DEFINES
+        QT_NO_REDEFINE_GUID_DEVINTERFACE_MODEM
+)
+
+qt_extend_target(SerialPort CONDITION QT_FEATURE_libudev AND UNIX
+    DEFINES
+        LINK_LIBUDEV
+)
+
+qt_extend_target(SerialPort CONDITION WIN32
+    SOURCES
+        qserialport_win.cpp
+        qserialportinfo_win.cpp
+    LIBRARIES
+        advapi32
+        setupapi
+)
+
+#### Keys ignored in scope 5:.:.:serialport-lib.pri:WIN32:
+# PRIVATE_HEADERS = "$$PWD/qtntdll_p.h"
+
+qt_extend_target(SerialPort CONDITION UNIX
+    SOURCES
+        qserialport_unix.cpp
+)
+
+qt_extend_target(SerialPort CONDITION APPLE_OSX
+    SOURCES
+        qserialportinfo_osx.cpp
+    LIBRARIES
+        ${FWCoreFoundation}
+        ${FWIOKit}
+)
+
+qt_extend_target(SerialPort CONDITION FREEBSD
+    SOURCES
+        qserialportinfo_freebsd.cpp
+)
+
+qt_extend_target(SerialPort CONDITION UNIX AND NOT APPLE_OSX AND NOT FREEBSD
+    SOURCES
+        qserialportinfo_unix.cpp
+)
+qt_add_docs(SerialPort
+    doc/qtserialport.qdocconf
+)
+
diff --git a/src/serialport/CMakeLists.txt b/src/serialport/CMakeLists.txt
index 9f360a0..e4f9b0f 100644
--- a/src/serialport/CMakeLists.txt
+++ b/src/serialport/CMakeLists.txt
@@ -1,44 +1,43 @@
 # Generated from serialport.pro.
 
-qt_find_package(Libudev PROVIDED_TARGETS PkgConfig::Libudev) # special case
-
 #####################################################################
 ## SerialPort Module:
 #####################################################################
 
-add_qt_module(SerialPort
+qt_find_package(Libudev PROVIDED_TARGETS PkgConfig::Libudev) # special case
+
+qt_add_module(SerialPort
     SOURCES
         qserialport.cpp qserialport.h qserialport_p.h
         qserialportglobal.h
         qserialportinfo.cpp qserialportinfo.h qserialportinfo_p.h
+    INCLUDE_DIRECTORIES
+        ${CMAKE_CURRENT_SOURCE_DIR}
     LIBRARIES
         Qt::CorePrivate
     PUBLIC_LIBRARIES
         Qt::Core
 )
 
-#### Keys ignored in scope 1:.:.:serialport.pro:<TRUE>:
-# _LOADED = "qt_module"
-
 ## Scopes:
 #####################################################################
 
 # special case begin
 # Temporarily remove until ntddmodm config test is ported
-#extend_target(SerialPort CONDITION QT_FEATURE_ntddmodm
+#qt_extend_target(SerialPort CONDITION QT_FEATURE_ntddmodm
 #    DEFINES
 #        QT_NO_REDEFINE_GUID_DEVINTERFACE_MODEM
 #)
 # special case end
 
-extend_target(SerialPort CONDITION QT_FEATURE_libudev AND UNIX
+qt_extend_target(SerialPort CONDITION QT_FEATURE_libudev AND UNIX
     DEFINES
         LINK_LIBUDEV
     LIBRARIES # special case
         PkgConfig::Libudev # special case
 )
 
-extend_target(SerialPort CONDITION WIN32
+qt_extend_target(SerialPort CONDITION WIN32
     SOURCES
         qserialport_win.cpp
         qserialportinfo_win.cpp
@@ -48,12 +47,15 @@ extend_target(SerialPort CONDITION WIN32
         setupapi
 )
 
-extend_target(SerialPort CONDITION UNIX
+#### Keys ignored in scope 5:.:.:serialport-lib.pri:WIN32:
+# PRIVATE_HEADERS = "$$PWD/qtntdll_p.h"
+
+qt_extend_target(SerialPort CONDITION UNIX
     SOURCES
         qserialport_unix.cpp
 )
 
-extend_target(SerialPort CONDITION APPLE_OSX
+qt_extend_target(SerialPort CONDITION APPLE_OSX
     SOURCES
         qserialportinfo_osx.cpp
     LIBRARIES
@@ -61,16 +63,16 @@ extend_target(SerialPort CONDITION APPLE_OSX
         ${FWIOKit}
 )
 
-extend_target(SerialPort CONDITION FREEBSD
+qt_extend_target(SerialPort CONDITION FREEBSD
     SOURCES
         qserialportinfo_freebsd.cpp
 )
 
-extend_target(SerialPort CONDITION UNIX AND NOT APPLE_OSX AND NOT FREEBSD
+qt_extend_target(SerialPort CONDITION UNIX AND NOT APPLE_OSX AND NOT FREEBSD
     SOURCES
         qserialportinfo_unix.cpp
 )
-add_qt_docs(
+qt_add_docs(SerialPort
     doc/qtserialport.qdocconf
 )
 
diff --git a/tests/auto/qserialport/.prev_CMakeLists.txt b/tests/auto/qserialport/.prev_CMakeLists.txt
new file mode 100644
index 0000000..7c75e49
--- /dev/null
+++ b/tests/auto/qserialport/.prev_CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qserialport.pro.
+
+#####################################################################
+## tst_qserialport Binary:
+#####################################################################
+
+qt_add_executable(tst_qserialport
+    SOURCES
+        tst_qserialport.cpp
+    PUBLIC_LIBRARIES
+        Qt::SerialPort
+        Qt::Test
+)
diff --git a/tests/auto/qserialport/CMakeLists.txt b/tests/auto/qserialport/CMakeLists.txt
index 184107f..899a627 100644
--- a/tests/auto/qserialport/CMakeLists.txt
+++ b/tests/auto/qserialport/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qserialport Binary:
 #####################################################################
 
-add_qt_test(tst_qserialport
+qt_add_test(tst_qserialport # special case
     SOURCES
         tst_qserialport.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qserialportinfo/.prev_CMakeLists.txt b/tests/auto/qserialportinfo/.prev_CMakeLists.txt
new file mode 100644
index 0000000..be89b65
--- /dev/null
+++ b/tests/auto/qserialportinfo/.prev_CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from qserialportinfo.pro.
+
+#####################################################################
+## tst_qserialportinfo Binary:
+#####################################################################
+
+qt_add_executable(tst_qserialportinfo
+    SOURCES
+        tst_qserialportinfo.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(tst_qserialportinfo CONDITION (QT_MAJOR_VERSION GREATER 4)
+    PUBLIC_LIBRARIES
+        Qt::SerialPort
+)
diff --git a/tests/auto/qserialportinfo/CMakeLists.txt b/tests/auto/qserialportinfo/CMakeLists.txt
index 20a2df0..86f7a82 100644
--- a/tests/auto/qserialportinfo/CMakeLists.txt
+++ b/tests/auto/qserialportinfo/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qserialportinfo Binary:
 #####################################################################
 
-add_qt_test(tst_qserialportinfo
+qt_add_test(tst_qserialportinfo # special case
     SOURCES
         tst_qserialportinfo.cpp
     PUBLIC_LIBRARIES
@@ -14,3 +14,8 @@ add_qt_test(tst_qserialportinfo
 
 ## Scopes:
 #####################################################################
+
+qt_extend_target(tst_qserialportinfo CONDITION (QT_MAJOR_VERSION GREATER 4)
+    PUBLIC_LIBRARIES
+        Qt::SerialPort
+)
diff --git a/tests/auto/qserialportinfoprivate/.prev_CMakeLists.txt b/tests/auto/qserialportinfoprivate/.prev_CMakeLists.txt
new file mode 100644
index 0000000..3bef9d2
--- /dev/null
+++ b/tests/auto/qserialportinfoprivate/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qserialportinfoprivate.pro.
+
+#####################################################################
+## tst_qserialportinfoprivate Binary:
+#####################################################################
+
+qt_add_executable(tst_qserialportinfoprivate
+    SOURCES
+        tst_qserialportinfoprivate.cpp
+    LIBRARIES
+        Qt::SerialPortPrivate
+    PUBLIC_LIBRARIES
+        Qt::SerialPort
+        Qt::Test
+)
diff --git a/tests/auto/qserialportinfoprivate/CMakeLists.txt b/tests/auto/qserialportinfoprivate/CMakeLists.txt
index 6a0a055..6d89333 100644
--- a/tests/auto/qserialportinfoprivate/CMakeLists.txt
+++ b/tests/auto/qserialportinfoprivate/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qserialportinfoprivate Binary:
 #####################################################################
 
-add_qt_test(tst_qserialportinfoprivate
+qt_add_test(tst_qserialportinfoprivate # special case
     SOURCES
         tst_qserialportinfoprivate.cpp
     LIBRARIES