Regenerate projectswip/cmake

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

58 files changed, 393 insertions, 133 deletions

diff --git a/examples/knx/device/CMakeLists.txt b/examples/knx/device/CMakeLists.txt
index 008639e..238384f 100644
--- a/examples/knx/device/CMakeLists.txt
+++ b/examples/knx/device/CMakeLists.txt
@@ -1,4 +1,6 @@
-cmake_minimum_required(VERSION 3.15.0)
+# Generated from device.pro.
+
+cmake_minimum_required(VERSION 3.14)
 project(device LANGUAGES CXX)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -7,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/knx/device")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
@@ -23,6 +25,7 @@ add_qt_gui_executable(device
 target_include_directories(device PUBLIC
     .
 )
+
 target_link_libraries(device PUBLIC
     Qt::Core
     Qt::Gui
diff --git a/examples/knx/discoverer/CMakeLists.txt b/examples/knx/discoverer/CMakeLists.txt
index 6d8c2d9..f28cad1 100644
--- a/examples/knx/discoverer/CMakeLists.txt
+++ b/examples/knx/discoverer/CMakeLists.txt
@@ -1,4 +1,6 @@
-cmake_minimum_required(VERSION 3.15.0)
+# Generated from discoverer.pro.
+
+cmake_minimum_required(VERSION 3.14)
 project(discoverer LANGUAGES CXX)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -7,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/knx/discoverer")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Knx)
@@ -19,6 +21,7 @@ add_executable(discoverer
 target_include_directories(discoverer PUBLIC
     .
 )
+
 target_link_libraries(discoverer PUBLIC
     Qt::Core
     Qt::Knx
diff --git a/examples/knx/feature/CMakeLists.txt b/examples/knx/feature/CMakeLists.txt
index cffb030..48c5eac 100644
--- a/examples/knx/feature/CMakeLists.txt
+++ b/examples/knx/feature/CMakeLists.txt
@@ -1,4 +1,6 @@
-cmake_minimum_required(VERSION 3.15.0)
+# Generated from feature.pro.
+
+cmake_minimum_required(VERSION 3.14)
 project(feature LANGUAGES CXX)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -7,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/knx/feature")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
@@ -23,6 +25,7 @@ add_qt_gui_executable(feature
 target_include_directories(feature PUBLIC
     .
 )
+
 target_link_libraries(feature PUBLIC
     Qt::Core
     Qt::Gui
diff --git a/examples/knx/group/CMakeLists.txt b/examples/knx/group/CMakeLists.txt
index a0dd6fe..4f40a89 100644
--- a/examples/knx/group/CMakeLists.txt
+++ b/examples/knx/group/CMakeLists.txt
@@ -1,4 +1,6 @@
-cmake_minimum_required(VERSION 3.15.0)
+# Generated from group.pro.
+
+cmake_minimum_required(VERSION 3.14)
 project(group LANGUAGES CXX)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -7,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/knx/group")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
@@ -24,6 +26,7 @@ add_qt_gui_executable(group
 target_include_directories(group PUBLIC
     .
 )
+
 target_link_libraries(group PUBLIC
     Qt::Core
     Qt::Gui
diff --git a/examples/knx/knxeditor/CMakeLists.txt b/examples/knx/knxeditor/CMakeLists.txt
index d36c821..3e8f87d 100644
--- a/examples/knx/knxeditor/CMakeLists.txt
+++ b/examples/knx/knxeditor/CMakeLists.txt
@@ -1,4 +1,6 @@
-cmake_minimum_required(VERSION 3.15.0)
+# Generated from knxeditor.pro.
+
+cmake_minimum_required(VERSION 3.14)
 project(knxeditor LANGUAGES CXX)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -7,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/knx/knxeditor")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
@@ -25,6 +27,7 @@ add_qt_gui_executable(knxeditor
 target_include_directories(knxeditor PUBLIC
     .
 )
+
 target_link_libraries(knxeditor PUBLIC
     Qt::Core
     Qt::Gui
diff --git a/examples/knx/knxproj/CMakeLists.txt b/examples/knx/knxproj/CMakeLists.txt
index 1fb9be3..d04b0a7 100644
--- a/examples/knx/knxproj/CMakeLists.txt
+++ b/examples/knx/knxproj/CMakeLists.txt
@@ -1,4 +1,6 @@
-cmake_minimum_required(VERSION 3.15.0)
+# Generated from knxproj.pro.
+
+cmake_minimum_required(VERSION 3.14)
 project(knxproj LANGUAGES CXX)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -7,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/knx/knxproj")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Knx)
@@ -18,6 +20,7 @@ add_executable(knxproj
 target_include_directories(knxproj PUBLIC
     .
 )
+
 target_link_libraries(knxproj PUBLIC
     Qt::Core
     Qt::Knx
diff --git a/examples/knx/router/CMakeLists.txt b/examples/knx/router/CMakeLists.txt
index 811e959..1002e09 100644
--- a/examples/knx/router/CMakeLists.txt
+++ b/examples/knx/router/CMakeLists.txt
@@ -1,4 +1,6 @@
-cmake_minimum_required(VERSION 3.15.0)
+# Generated from router.pro.
+
+cmake_minimum_required(VERSION 3.14)
 project(router LANGUAGES CXX)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -7,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/knx/router")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Knx)
@@ -19,6 +21,7 @@ add_executable(router
 target_include_directories(router PUBLIC
     .
 )
+
 target_link_libraries(router PUBLIC
     Qt::Core
     Qt::Knx
diff --git a/examples/knx/tunnelclient/CMakeLists.txt b/examples/knx/tunnelclient/CMakeLists.txt
index d98fac9..8a3c7e7 100644
--- a/examples/knx/tunnelclient/CMakeLists.txt
+++ b/examples/knx/tunnelclient/CMakeLists.txt
@@ -1,4 +1,6 @@
-cmake_minimum_required(VERSION 3.15.0)
+# Generated from tunnelclient.pro.
+
+cmake_minimum_required(VERSION 3.14)
 project(tunnelclient LANGUAGES CXX)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -7,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/knx/tunnelclient")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Knx)
@@ -19,6 +21,7 @@ add_executable(tunnelclient
 target_include_directories(tunnelclient PUBLIC
     .
 )
+
 target_link_libraries(tunnelclient PUBLIC
     Qt::Core
     Qt::Knx
diff --git a/src/knx/.prev_CMakeLists.txt b/src/knx/.prev_CMakeLists.txt
index c5945d9..996642f 100644
--- a/src/knx/.prev_CMakeLists.txt
+++ b/src/knx/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## Knx Module:
 #####################################################################
 
-add_qt_module(Knx
+qt_add_module(Knx
     SOURCES
         core/qknxbytearray.cpp core/qknxbytearray.h
         dpt/qknx1bit.cpp
@@ -238,13 +238,10 @@ add_qt_module(Knx
         Qt::Core
 )
 
-#### Keys ignored in scope 1:.:.:knx.pro:<TRUE>:
-# _LOADED = "qt_module"
-
 ## Scopes:
 #####################################################################
 
-extend_target(Knx CONDITION QT_FEATURE_opensslv11
+qt_extend_target(Knx CONDITION QT_FEATURE_opensslv11
     SOURCES
         ssl/qsslsocket_openssl11_symbols_p.h
         ssl/qsslsocket_openssl_symbols.cpp ssl/qsslsocket_openssl_symbols_p.h
@@ -252,21 +249,21 @@ extend_target(Knx CONDITION QT_FEATURE_opensslv11
         OPENSSL_API_COMPAT=0x10100000L
 )
 
-extend_target(Knx CONDITION QT_FEATURE_openssl_linked AND QT_FEATURE_opensslv11
+qt_extend_target(Knx CONDITION QT_FEATURE_openssl_linked AND QT_FEATURE_opensslv11
     LIBRARIES
         OpenSSL::SSL
 )
 
-extend_target(Knx CONDITION QT_FEATURE_opensslv11 AND NOT QT_FEATURE_openssl_linked
+qt_extend_target(Knx CONDITION QT_FEATURE_opensslv11 AND NOT QT_FEATURE_openssl_linked
     LIBRARIES
         OpenSSL::SSL_nolink
 )
 
-extend_target(Knx CONDITION QT_FEATURE_opensslv11 AND WIN32
+qt_extend_target(Knx CONDITION QT_FEATURE_opensslv11 AND WIN32
     LIBRARIES
         crypt32
 )
-add_qt_docs(
+qt_add_docs(Knx
     doc/qtknx.qdocconf
 )
 
diff --git a/src/knx/CMakeLists.txt b/src/knx/CMakeLists.txt
index 4e5ec08..7be0a55 100644
--- a/src/knx/CMakeLists.txt
+++ b/src/knx/CMakeLists.txt
@@ -8,7 +8,7 @@ if(BUILD_SHARED_LIBS)
     qt_find_package(ZLIB REQUIRED PROVIDED_TARGETS ZLIB::ZLIB)
 endif()
 
-add_qt_module(Knx
+qt_add_module(Knx
     SOURCES
 # core
         core/qknxbytearray.cpp
@@ -279,14 +279,11 @@ add_qt_module(Knx
         Qt::Core
 )
 
-#### Keys ignored in scope 1:.:.:knx.pro:<TRUE>:
-# _LOADED = "qt_module"
-
 ## Scopes:
 #####################################################################
 
 # special case begin
-extend_target(Knx CONDITION QT_FEATURE_opensslv11
+qt_extend_target(Knx CONDITION QT_FEATURE_opensslv11
     SOURCES
         ssl/qsslsocket_openssl11_symbols_p.h
         ssl/qsslsocket_openssl_symbols.cpp
@@ -296,22 +293,22 @@ extend_target(Knx CONDITION QT_FEATURE_opensslv11
 )
 # special case end
 
-extend_target(Knx CONDITION QT_FEATURE_openssl_linked AND QT_FEATURE_opensslv11
+qt_extend_target(Knx CONDITION QT_FEATURE_openssl_linked AND QT_FEATURE_opensslv11
     LIBRARIES
         OpenSSL::SSL
 )
 
 # special case begin
-#extend_target(Knx CONDITION QT_FEATURE_opensslv11 AND NOT QT_FEATURE_openssl_linked
+#qt_extend_target(Knx CONDITION QT_FEATURE_opensslv11 AND NOT QT_FEATURE_openssl_linked
 #    LIBRARIES
-#        OpenSSL::SSL_nolink
+#       OpenSSL::SSL_nolink
 #)
 # special case end
 
-extend_target(Knx CONDITION QT_FEATURE_opensslv11 AND WIN32
+qt_extend_target(Knx CONDITION QT_FEATURE_opensslv11 AND WIN32
     LIBRARIES
         crypt32
 )
-add_qt_docs(
+qt_add_docs(Knx
     doc/qtknx.qdocconf
 )
diff --git a/tests/auto/qknxadditionalinfo/CMakeLists.txt b/tests/auto/qknxadditionalinfo/CMakeLists.txt
index ec5d8ca..ab4051d 100644
--- a/tests/auto/qknxadditionalinfo/CMakeLists.txt
+++ b/tests/auto/qknxadditionalinfo/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxadditionalinfo
-    GUI
+# Generated from qknxadditionalinfo.pro.
+
+#####################################################################
+## tst_qknxadditionalinfo Test:
+#####################################################################
+
+qt_add_test(tst_qknxadditionalinfo
     SOURCES
         tst_qknxadditionalinfo.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxaddress/CMakeLists.txt b/tests/auto/qknxaddress/CMakeLists.txt
index 22922d5..39401b7 100644
--- a/tests/auto/qknxaddress/CMakeLists.txt
+++ b/tests/auto/qknxaddress/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxaddress
-    GUI
+# Generated from qknxaddress.pro.
+
+#####################################################################
+## tst_qknxaddress Test:
+#####################################################################
+
+qt_add_test(tst_qknxaddress
     SOURCES
         tst_qknxaddress.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxbytearray/CMakeLists.txt b/tests/auto/qknxbytearray/CMakeLists.txt
index 97f2226..3efd276 100644
--- a/tests/auto/qknxbytearray/CMakeLists.txt
+++ b/tests/auto/qknxbytearray/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxbytearray
-    GUI
+# Generated from qknxbytearray.pro.
+
+#####################################################################
+## tst_qknxbytearray Test:
+#####################################################################
+
+qt_add_test(tst_qknxbytearray
     SOURCES
         tst_qknxbytearray.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxcontrolfield/CMakeLists.txt b/tests/auto/qknxcontrolfield/CMakeLists.txt
index ccc977a..2a7fae4 100644
--- a/tests/auto/qknxcontrolfield/CMakeLists.txt
+++ b/tests/auto/qknxcontrolfield/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxcontrolfield
-    GUI
+# Generated from qknxcontrolfield.pro.
+
+#####################################################################
+## tst_qknxcontrolfield Test:
+#####################################################################
+
+qt_add_test(tst_qknxcontrolfield
     SOURCES
         tst_qknxcontrolfield.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxcryptographicengine/CMakeLists.txt b/tests/auto/qknxcryptographicengine/CMakeLists.txt
index ae6f564..e5bc31a 100644
--- a/tests/auto/qknxcryptographicengine/CMakeLists.txt
+++ b/tests/auto/qknxcryptographicengine/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxcryptographicengine
-    GUI
+# Generated from qknxcryptographicengine.pro.
+
+#####################################################################
+## tst_qknxcryptographicengine Test:
+#####################################################################
+
+qt_add_test(tst_qknxcryptographicengine
     SOURCES
         tst_qknxcryptographicengine.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxdatapointtype/CMakeLists.txt b/tests/auto/qknxdatapointtype/CMakeLists.txt
index 277b880..579bc45 100644
--- a/tests/auto/qknxdatapointtype/CMakeLists.txt
+++ b/tests/auto/qknxdatapointtype/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxdatapointtype
-    GUI
+# Generated from qknxdatapointtype.pro.
+
+#####################################################################
+## tst_qknxdatapointtype Test:
+#####################################################################
+
+qt_add_test(tst_qknxdatapointtype
     SOURCES
         tst_qknxdatapointtype.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxdevicemanagementframe/CMakeLists.txt b/tests/auto/qknxdevicemanagementframe/CMakeLists.txt
index 802c65f..f283b9f 100644
--- a/tests/auto/qknxdevicemanagementframe/CMakeLists.txt
+++ b/tests/auto/qknxdevicemanagementframe/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxdevicemanagementframe
-    GUI
+# Generated from qknxdevicemanagementframe.pro.
+
+#####################################################################
+## tst_qknxdevicemanagementframe Test:
+#####################################################################
+
+qt_add_test(tst_qknxdevicemanagementframe
     SOURCES
         tst_qknxdevicemanagementframe.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxgroupaddressinfo/CMakeLists.txt b/tests/auto/qknxgroupaddressinfo/CMakeLists.txt
index d79de02..269d577 100644
--- a/tests/auto/qknxgroupaddressinfo/CMakeLists.txt
+++ b/tests/auto/qknxgroupaddressinfo/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxgroupaddressinfo
-    GUI
+# Generated from qknxgroupaddressinfo.pro.
+
+#####################################################################
+## tst_qknxgroupaddressinfo Test:
+#####################################################################
+
+qt_add_test(tst_qknxgroupaddressinfo
     SOURCES
         tst_qknxgroupaddressinfo.cpp
     PUBLIC_LIBRARIES
@@ -12,9 +17,10 @@ set(project_resource_files
     "data/qt.io.knxproj"
 )
 
-add_qt_resource(tst_qknxgroupaddressinfo "project"
+qt_add_resource(tst_qknxgroupaddressinfo "project"
     PREFIX
         "/"
     FILES
         ${project_resource_files}
 )
+
diff --git a/tests/auto/qknxnetipconfigdib/CMakeLists.txt b/tests/auto/qknxnetipconfigdib/CMakeLists.txt
index f071227..a9c88f6 100644
--- a/tests/auto/qknxnetipconfigdib/CMakeLists.txt
+++ b/tests/auto/qknxnetipconfigdib/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetipconfigdib
-    GUI
+# Generated from qknxnetipconfigdib.pro.
+
+#####################################################################
+## tst_qknxnetipconfigdib Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetipconfigdib
     SOURCES
         tst_qknxnetipconfigdib.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetipconnectionheader/CMakeLists.txt b/tests/auto/qknxnetipconnectionheader/CMakeLists.txt
index 91a6d10..b07dae9 100644
--- a/tests/auto/qknxnetipconnectionheader/CMakeLists.txt
+++ b/tests/auto/qknxnetipconnectionheader/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetipconnectionheader
-    GUI
+# Generated from qknxnetipconnectionheader.pro.
+
+#####################################################################
+## tst_qknxnetipconnectionheader Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetipconnectionheader
     SOURCES
         tst_qknxnetipconnectionheader.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetipconnectionstaterequest/CMakeLists.txt b/tests/auto/qknxnetipconnectionstaterequest/CMakeLists.txt
index f2f0ced..ae63da1 100644
--- a/tests/auto/qknxnetipconnectionstaterequest/CMakeLists.txt
+++ b/tests/auto/qknxnetipconnectionstaterequest/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetipconnectionstaterequest
-    GUI
+# Generated from qknxnetipconnectionstaterequest.pro.
+
+#####################################################################
+## tst_qknxnetipconnectionstaterequest Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetipconnectionstaterequest
     SOURCES
         tst_qknxnetipconnectionstaterequest.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetipconnectionstateresponse/CMakeLists.txt b/tests/auto/qknxnetipconnectionstateresponse/CMakeLists.txt
index dbc57d3..58aee74 100644
--- a/tests/auto/qknxnetipconnectionstateresponse/CMakeLists.txt
+++ b/tests/auto/qknxnetipconnectionstateresponse/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetipconnectionstateresponse
-    GUI
+# Generated from qknxnetipconnectionstateresponse.pro.
+
+#####################################################################
+## tst_qknxnetipconnectionstateresponse Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetipconnectionstateresponse
     SOURCES
         tst_qknxnetipconnectionstateresponse.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetipconnectrequest/CMakeLists.txt b/tests/auto/qknxnetipconnectrequest/CMakeLists.txt
index a9f38dd..16f2563 100644
--- a/tests/auto/qknxnetipconnectrequest/CMakeLists.txt
+++ b/tests/auto/qknxnetipconnectrequest/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetipconnectrequest
-    GUI
+# Generated from qknxnetipconnectrequest.pro.
+
+#####################################################################
+## tst_qknxnetipconnectrequest Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetipconnectrequest
     SOURCES
         tst_qknxnetipconnectrequest.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetipconnectresponse/CMakeLists.txt b/tests/auto/qknxnetipconnectresponse/CMakeLists.txt
index 0c3b028..f017ba4 100644
--- a/tests/auto/qknxnetipconnectresponse/CMakeLists.txt
+++ b/tests/auto/qknxnetipconnectresponse/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetipconnectresponse
-    GUI
+# Generated from qknxnetipconnectresponse.pro.
+
+#####################################################################
+## tst_qknxnetipconnectresponse Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetipconnectresponse
     SOURCES
         tst_qknxnetipconnectresponse.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetipcrd/CMakeLists.txt b/tests/auto/qknxnetipcrd/CMakeLists.txt
index 0aa45cf..7118244 100644
--- a/tests/auto/qknxnetipcrd/CMakeLists.txt
+++ b/tests/auto/qknxnetipcrd/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetipcrd
-    GUI
+# Generated from qknxnetipcrd.pro.
+
+#####################################################################
+## tst_qknxnetipcrd Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetipcrd
     SOURCES
         tst_qknxnetipcrd.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetipcri/CMakeLists.txt b/tests/auto/qknxnetipcri/CMakeLists.txt
index 94d42d9..bd19029 100644
--- a/tests/auto/qknxnetipcri/CMakeLists.txt
+++ b/tests/auto/qknxnetipcri/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetipcri
-    GUI
+# Generated from qknxnetipcri.pro.
+
+#####################################################################
+## tst_qknxnetipcri Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetipcri
     SOURCES
         tst_qknxnetipcri.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetipcurrentconfigdib/CMakeLists.txt b/tests/auto/qknxnetipcurrentconfigdib/CMakeLists.txt
index c6ae5c6..0c0e8c9 100644
--- a/tests/auto/qknxnetipcurrentconfigdib/CMakeLists.txt
+++ b/tests/auto/qknxnetipcurrentconfigdib/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetipcurrentconfigdib
-    GUI
+# Generated from qknxnetipcurrentconfigdib.pro.
+
+#####################################################################
+## tst_qknxnetipcurrentconfigdib Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetipcurrentconfigdib
     SOURCES
         tst_qknxnetipcurrentconfigdib.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetipdescriptionrequest/CMakeLists.txt b/tests/auto/qknxnetipdescriptionrequest/CMakeLists.txt
index a1c483c..6b8910d 100644
--- a/tests/auto/qknxnetipdescriptionrequest/CMakeLists.txt
+++ b/tests/auto/qknxnetipdescriptionrequest/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetipdescriptionrequest
-    GUI
+# Generated from qknxnetipdescriptionrequest.pro.
+
+#####################################################################
+## tst_qknxnetipdescriptionrequest Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetipdescriptionrequest
     SOURCES
         tst_qknxnetipdescriptionrequest.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetipdescriptionresponse/CMakeLists.txt b/tests/auto/qknxnetipdescriptionresponse/CMakeLists.txt
index 153add2..af78e7b 100644
--- a/tests/auto/qknxnetipdescriptionresponse/CMakeLists.txt
+++ b/tests/auto/qknxnetipdescriptionresponse/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetipdescriptionresponse
-    GUI
+# Generated from qknxnetipdescriptionresponse.pro.
+
+#####################################################################
+## tst_qknxnetipdescriptionresponse Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetipdescriptionresponse
     SOURCES
         tst_qknxnetipdescriptionresponse.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetipdeviceconfigurationacknowledge/CMakeLists.txt b/tests/auto/qknxnetipdeviceconfigurationacknowledge/CMakeLists.txt
index 1f23c28..9d59600 100644
--- a/tests/auto/qknxnetipdeviceconfigurationacknowledge/CMakeLists.txt
+++ b/tests/auto/qknxnetipdeviceconfigurationacknowledge/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetipdeviceconfigurationacknowledge
-    GUI
+# Generated from qknxnetipdeviceconfigurationacknowledge.pro.
+
+#####################################################################
+## tst_qknxnetipdeviceconfigurationacknowledge Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetipdeviceconfigurationacknowledge
     SOURCES
         tst_qknxnetipdeviceconfigurationacknowledge.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetipdeviceconfigurationrequest/CMakeLists.txt b/tests/auto/qknxnetipdeviceconfigurationrequest/CMakeLists.txt
index ffe6e2c..3db985e 100644
--- a/tests/auto/qknxnetipdeviceconfigurationrequest/CMakeLists.txt
+++ b/tests/auto/qknxnetipdeviceconfigurationrequest/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetipdeviceconfigurationrequest
-    GUI
+# Generated from qknxnetipdeviceconfigurationrequest.pro.
+
+#####################################################################
+## tst_qknxnetipdeviceconfigurationrequest Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetipdeviceconfigurationrequest
     SOURCES
         tst_qknxnetipdeviceconfigurationrequest.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetipdevicedib/CMakeLists.txt b/tests/auto/qknxnetipdevicedib/CMakeLists.txt
index ffa72e6..5aae7c7 100644
--- a/tests/auto/qknxnetipdevicedib/CMakeLists.txt
+++ b/tests/auto/qknxnetipdevicedib/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetipdevicedib
-    GUI
+# Generated from qknxnetipdevicedib.pro.
+
+#####################################################################
+## tst_qknxnetipdevicedib Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetipdevicedib
     SOURCES
         tst_qknxnetipdevicedib.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetipdisconnectrequest/CMakeLists.txt b/tests/auto/qknxnetipdisconnectrequest/CMakeLists.txt
index a91deb8..16a3d5c 100644
--- a/tests/auto/qknxnetipdisconnectrequest/CMakeLists.txt
+++ b/tests/auto/qknxnetipdisconnectrequest/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetipdisconnectrequest
-    GUI
+# Generated from qknxnetipdisconnectrequest.pro.
+
+#####################################################################
+## tst_qknxnetipdisconnectrequest Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetipdisconnectrequest
     SOURCES
         tst_qknxnetipdisconnectrequest.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetipdisconnectresponse/CMakeLists.txt b/tests/auto/qknxnetipdisconnectresponse/CMakeLists.txt
index b972145..3b5e90d 100644
--- a/tests/auto/qknxnetipdisconnectresponse/CMakeLists.txt
+++ b/tests/auto/qknxnetipdisconnectresponse/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetipdisconnectresponse
-    GUI
+# Generated from qknxnetipdisconnectresponse.pro.
+
+#####################################################################
+## tst_qknxnetipdisconnectresponse Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetipdisconnectresponse
     SOURCES
         tst_qknxnetipdisconnectresponse.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetipextendeddevicedib/CMakeLists.txt b/tests/auto/qknxnetipextendeddevicedib/CMakeLists.txt
index 62778e9..b1d4af7 100644
--- a/tests/auto/qknxnetipextendeddevicedib/CMakeLists.txt
+++ b/tests/auto/qknxnetipextendeddevicedib/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetipextendeddevicedib
-    GUI
+# Generated from qknxnetipextendeddevicedib.pro.
+
+#####################################################################
+## tst_qknxnetipextendeddevicedib Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetipextendeddevicedib
     SOURCES
         tst_qknxnetipextendeddevicedib.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetiphpai/CMakeLists.txt b/tests/auto/qknxnetiphpai/CMakeLists.txt
index 9503743..9503a18 100644
--- a/tests/auto/qknxnetiphpai/CMakeLists.txt
+++ b/tests/auto/qknxnetiphpai/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetiphpai
-    GUI
+# Generated from qknxnetiphpai.pro.
+
+#####################################################################
+## tst_qknxnetiphpai Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetiphpai
     SOURCES
         tst_qknxnetiphpai.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetipknxaddressesdib/CMakeLists.txt b/tests/auto/qknxnetipknxaddressesdib/CMakeLists.txt
index a359b8a..07ea10f 100644
--- a/tests/auto/qknxnetipknxaddressesdib/CMakeLists.txt
+++ b/tests/auto/qknxnetipknxaddressesdib/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetipknxaddressesdib
-    GUI
+# Generated from qknxnetipknxaddressesdib.pro.
+
+#####################################################################
+## tst_qknxnetipknxaddressesdib Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetipknxaddressesdib
     SOURCES
         tst_qknxnetipknxaddressesdib.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetipmanufacturerdib/CMakeLists.txt b/tests/auto/qknxnetipmanufacturerdib/CMakeLists.txt
index a29c68b..f58f498 100644
--- a/tests/auto/qknxnetipmanufacturerdib/CMakeLists.txt
+++ b/tests/auto/qknxnetipmanufacturerdib/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetipmanufacturerdib
-    GUI
+# Generated from qknxnetipmanufacturerdib.pro.
+
+#####################################################################
+## tst_qknxnetipmanufacturerdib Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetipmanufacturerdib
     SOURCES
         tst_qknxnetipmanufacturerdib.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetiprouter/CMakeLists.txt b/tests/auto/qknxnetiprouter/CMakeLists.txt
index 9c1e640..a868b10 100644
--- a/tests/auto/qknxnetiprouter/CMakeLists.txt
+++ b/tests/auto/qknxnetiprouter/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetiproutinginterface
-    GUI
+# Generated from qknxnetiprouter.pro.
+
+#####################################################################
+## tst_qknxnetiproutinginterface Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetiproutinginterface
     SOURCES
         tst_qknxnetiprouter.cpp
     LIBRARIES
diff --git a/tests/auto/qknxnetiproutingbusy/CMakeLists.txt b/tests/auto/qknxnetiproutingbusy/CMakeLists.txt
index bc8ed26..59b355a 100644
--- a/tests/auto/qknxnetiproutingbusy/CMakeLists.txt
+++ b/tests/auto/qknxnetiproutingbusy/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetiproutingbusy
-    GUI
+# Generated from qknxnetiproutingbusy.pro.
+
+#####################################################################
+## tst_qknxnetiproutingbusy Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetiproutingbusy
     SOURCES
         tst_qknxnetiproutingbusy.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetiproutingindication/CMakeLists.txt b/tests/auto/qknxnetiproutingindication/CMakeLists.txt
index b550229..ee1245b 100644
--- a/tests/auto/qknxnetiproutingindication/CMakeLists.txt
+++ b/tests/auto/qknxnetiproutingindication/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetiproutingindication
-    GUI
+# Generated from qknxnetiproutingindication.pro.
+
+#####################################################################
+## tst_qknxnetiproutingindication Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetiproutingindication
     SOURCES
         tst_qknxnetiproutingindication.cpp
     LIBRARIES
diff --git a/tests/auto/qknxnetiproutinglostmessage/CMakeLists.txt b/tests/auto/qknxnetiproutinglostmessage/CMakeLists.txt
index f9e8588..9fec7a1 100644
--- a/tests/auto/qknxnetiproutinglostmessage/CMakeLists.txt
+++ b/tests/auto/qknxnetiproutinglostmessage/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetiproutinglostmessage
-    GUI
+# Generated from qknxnetiproutinglostmessage.pro.
+
+#####################################################################
+## tst_qknxnetiproutinglostmessage Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetiproutinglostmessage
     SOURCES
         tst_qknxnetiproutinglostmessage.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetiproutingsystembroadcast/CMakeLists.txt b/tests/auto/qknxnetiproutingsystembroadcast/CMakeLists.txt
index e58cc75..40c16f4 100644
--- a/tests/auto/qknxnetiproutingsystembroadcast/CMakeLists.txt
+++ b/tests/auto/qknxnetiproutingsystembroadcast/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetiproutingsystembroadcast
-    GUI
+# Generated from qknxnetiproutingsystembroadcast.pro.
+
+#####################################################################
+## tst_qknxnetiproutingsystembroadcast Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetiproutingsystembroadcast
     SOURCES
         tst_qknxnetiproutingsystembroadcast.cpp
     LIBRARIES
diff --git a/tests/auto/qknxnetipsearchrequest/CMakeLists.txt b/tests/auto/qknxnetipsearchrequest/CMakeLists.txt
index eb5bd24..a760c1c 100644
--- a/tests/auto/qknxnetipsearchrequest/CMakeLists.txt
+++ b/tests/auto/qknxnetipsearchrequest/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetipsearchrequest
-    GUI
+# Generated from qknxnetipsearchrequest.pro.
+
+#####################################################################
+## tst_qknxnetipsearchrequest Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetipsearchrequest
     SOURCES
         tst_qknxnetipsearchrequest.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetipsearchresponse/CMakeLists.txt b/tests/auto/qknxnetipsearchresponse/CMakeLists.txt
index 4dc5e95..33ab0ac 100644
--- a/tests/auto/qknxnetipsearchresponse/CMakeLists.txt
+++ b/tests/auto/qknxnetipsearchresponse/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetipsearchresponse
-    GUI
+# Generated from qknxnetipsearchresponse.pro.
+
+#####################################################################
+## tst_qknxnetipsearchresponse Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetipsearchresponse
     SOURCES
         tst_qknxnetipsearchresponse.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetipsecuredservicefamiliesdib/CMakeLists.txt b/tests/auto/qknxnetipsecuredservicefamiliesdib/CMakeLists.txt
index 776814d..92b8681 100644
--- a/tests/auto/qknxnetipsecuredservicefamiliesdib/CMakeLists.txt
+++ b/tests/auto/qknxnetipsecuredservicefamiliesdib/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetipsecuredservicefamiliesdib
-    GUI
+# Generated from qknxnetipsecuredservicefamiliesdib.pro.
+
+#####################################################################
+## tst_qknxnetipsecuredservicefamiliesdib Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetipsecuredservicefamiliesdib
     SOURCES
         tst_qknxnetipsecuredservicefamiliesdib.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetipservicefamiliesdib/CMakeLists.txt b/tests/auto/qknxnetipservicefamiliesdib/CMakeLists.txt
index 04b0639..cf3d395 100644
--- a/tests/auto/qknxnetipservicefamiliesdib/CMakeLists.txt
+++ b/tests/auto/qknxnetipservicefamiliesdib/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetipservicefamiliesdib
-    GUI
+# Generated from qknxnetipservicefamiliesdib.pro.
+
+#####################################################################
+## tst_qknxnetipservicefamiliesdib Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetipservicefamiliesdib
     SOURCES
         tst_qknxnetipservicefamiliesdib.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetipsessionrequest/CMakeLists.txt b/tests/auto/qknxnetipsessionrequest/CMakeLists.txt
index 1a5f2db..751c2e7 100644
--- a/tests/auto/qknxnetipsessionrequest/CMakeLists.txt
+++ b/tests/auto/qknxnetipsessionrequest/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetipsessionrequest
-    GUI
+# Generated from qknxnetipsessionrequest.pro.
+
+#####################################################################
+## tst_qknxnetipsessionrequest Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetipsessionrequest
     SOURCES
         tst_qknxnetipsessionrequest.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetipsessionresponse/CMakeLists.txt b/tests/auto/qknxnetipsessionresponse/CMakeLists.txt
index fc71594..3536cfd 100644
--- a/tests/auto/qknxnetipsessionresponse/CMakeLists.txt
+++ b/tests/auto/qknxnetipsessionresponse/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetipsessionresponse
-    GUI
+# Generated from qknxnetipsessionresponse.pro.
+
+#####################################################################
+## tst_qknxnetipsessionresponse Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetipsessionresponse
     SOURCES
         tst_qknxnetipsessionresponse.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetipstructure/CMakeLists.txt b/tests/auto/qknxnetipstructure/CMakeLists.txt
index 552592d..5bbedad 100644
--- a/tests/auto/qknxnetipstructure/CMakeLists.txt
+++ b/tests/auto/qknxnetipstructure/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetipstructure
-    GUI
+# Generated from qknxnetipstructure.pro.
+
+#####################################################################
+## tst_qknxnetipstructure Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetipstructure
     SOURCES
         tst_qknxnetipstructure.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetiptunnelingacknowledge/CMakeLists.txt b/tests/auto/qknxnetiptunnelingacknowledge/CMakeLists.txt
index 0a42453..b6cd8d6 100644
--- a/tests/auto/qknxnetiptunnelingacknowledge/CMakeLists.txt
+++ b/tests/auto/qknxnetiptunnelingacknowledge/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetiptunnelingacknowledge
-    GUI
+# Generated from qknxnetiptunnelingacknowledge.pro.
+
+#####################################################################
+## tst_qknxnetiptunnelingacknowledge Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetiptunnelingacknowledge
     SOURCES
         tst_qknxnetiptunnelingacknowledge.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetiptunnelingfeature/CMakeLists.txt b/tests/auto/qknxnetiptunnelingfeature/CMakeLists.txt
index bddb055..b5cafa9 100644
--- a/tests/auto/qknxnetiptunnelingfeature/CMakeLists.txt
+++ b/tests/auto/qknxnetiptunnelingfeature/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetiptunnelingfeature
-    GUI
+# Generated from qknxnetiptunnelingfeature.pro.
+
+#####################################################################
+## tst_qknxnetiptunnelingfeature Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetiptunnelingfeature
     SOURCES
         tst_qknxnetiptunnelingfeature.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetiptunnelinginfodib/CMakeLists.txt b/tests/auto/qknxnetiptunnelinginfodib/CMakeLists.txt
index e924d4f..498e07d 100644
--- a/tests/auto/qknxnetiptunnelinginfodib/CMakeLists.txt
+++ b/tests/auto/qknxnetiptunnelinginfodib/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetiptunnelinginfodib
-    GUI
+# Generated from qknxnetiptunnelinginfodib.pro.
+
+#####################################################################
+## tst_qknxnetiptunnelinginfodib Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetiptunnelinginfodib
     SOURCES
         tst_qknxnetiptunnelinginfodib.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxnetiptunnelingrequest/CMakeLists.txt b/tests/auto/qknxnetiptunnelingrequest/CMakeLists.txt
index 8bc7d02..e91a9d2 100644
--- a/tests/auto/qknxnetiptunnelingrequest/CMakeLists.txt
+++ b/tests/auto/qknxnetiptunnelingrequest/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxnetiptunnelingrequest
-    GUI
+# Generated from qknxnetiptunnelingrequest.pro.
+
+#####################################################################
+## tst_qknxnetiptunnelingrequest Test:
+#####################################################################
+
+qt_add_test(tst_qknxnetiptunnelingrequest
     SOURCES
         tst_qknxnetiptunnelingrequest.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qknxproject/CMakeLists.txt b/tests/auto/qknxproject/CMakeLists.txt
index 1461278..e092ef4 100644
--- a/tests/auto/qknxproject/CMakeLists.txt
+++ b/tests/auto/qknxproject/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxproject
-    GUI
+# Generated from qknxproject.pro.
+
+#####################################################################
+## tst_qknxproject Test:
+#####################################################################
+
+qt_add_test(tst_qknxproject
     SOURCES
         tst_qknxproject.cpp
     LIBRARIES
@@ -19,9 +24,10 @@ set(project_resource_files
     "data/unassigneddevices.xml"
 )
 
-add_qt_resource(tst_qknxproject "project"
+qt_add_resource(tst_qknxproject "project"
     PREFIX
         "/"
     FILES
         ${project_resource_files}
 )
+
diff --git a/tests/auto/qknxtpdufactory/CMakeLists.txt b/tests/auto/qknxtpdufactory/CMakeLists.txt
index 49990d8..0cc32f2 100644
--- a/tests/auto/qknxtpdufactory/CMakeLists.txt
+++ b/tests/auto/qknxtpdufactory/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxtpdufactory
-    GUI
+# Generated from qknxtpdufactory.pro.
+
+#####################################################################
+## tst_qknxtpdufactory Test:
+#####################################################################
+
+qt_add_test(tst_qknxtpdufactory
     SOURCES
         tst_qknxtpdufactory.cpp
     LIBRARIES
diff --git a/tests/auto/qknxtunnelframe/CMakeLists.txt b/tests/auto/qknxtunnelframe/CMakeLists.txt
index 3c42874..f1b1361 100644
--- a/tests/auto/qknxtunnelframe/CMakeLists.txt
+++ b/tests/auto/qknxtunnelframe/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxtunnelframe
-    GUI
+# Generated from qknxtunnelframe.pro.
+
+#####################################################################
+## tst_qknxtunnelframe Test:
+#####################################################################
+
+qt_add_test(tst_qknxtunnelframe
     SOURCES
         tst_qknxtunnelframe.cpp
     LIBRARIES
diff --git a/tests/auto/qknxtunnelframefactory/CMakeLists.txt b/tests/auto/qknxtunnelframefactory/CMakeLists.txt
index 94e3b47..d0cd4da 100644
--- a/tests/auto/qknxtunnelframefactory/CMakeLists.txt
+++ b/tests/auto/qknxtunnelframefactory/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_qt_test(tst_qknxtunnelframefactory
-    GUI
+# Generated from qknxtunnelframefactory.pro.
+
+#####################################################################
+## tst_qknxtunnelframefactory Test:
+#####################################################################
+
+qt_add_test(tst_qknxtunnelframefactory
     SOURCES
         tst_qknxtunnelframefactory.cpp
     LIBRARIES