diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-07 18:01:06 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-09 09:38:35 +0200 |
commit | e9a328bc0e56b429a370b13c8e0b4790916cebde (patch) | |
tree | 059f3b089a8557cb4c45e3dc059b58e020e34dcb /tests/auto/network/socket | |
parent | 5417f1e40cb647c05bffad21493feacac45f193e (diff) |
CMake: Regenerate tests with new qt_ prefixed APIs
Use pro2cmake with '--api-version 2' to force regenerate
projects to use the new prefixed qt_foo APIs.
Change-Id: I055c4837860319e93aaa6b09d646dda4fc2a4069
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/network/socket')
18 files changed, 25 insertions, 25 deletions
diff --git a/tests/auto/network/socket/platformsocketengine/CMakeLists.txt b/tests/auto/network/socket/platformsocketengine/CMakeLists.txt index bb29119011..780826f211 100644 --- a/tests/auto/network/socket/platformsocketengine/CMakeLists.txt +++ b/tests/auto/network/socket/platformsocketengine/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_platformsocketengine Test: ##################################################################### -add_qt_test(tst_platformsocketengine +qt_add_test(tst_platformsocketengine SOURCES tst_platformsocketengine.cpp INCLUDE_DIRECTORIES @@ -25,7 +25,7 @@ add_qt_test(tst_platformsocketengine ## Scopes: ##################################################################### -extend_target(tst_platformsocketengine CONDITION WIN32 +qt_extend_target(tst_platformsocketengine CONDITION WIN32 PUBLIC_LIBRARIES ws2_32 ) diff --git a/tests/auto/network/socket/qabstractsocket/CMakeLists.txt b/tests/auto/network/socket/qabstractsocket/CMakeLists.txt index ca7d64a2ff..b5de9360c3 100644 --- a/tests/auto/network/socket/qabstractsocket/CMakeLists.txt +++ b/tests/auto/network/socket/qabstractsocket/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstractsocket Test: ##################################################################### -add_qt_test(tst_qabstractsocket +qt_add_test(tst_qabstractsocket SOURCES tst_qabstractsocket.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt b/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt index 22007a31d1..8afcdc3376 100644 --- a/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt +++ b/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qhttpsocketengine Test: ##################################################################### -add_qt_test(tst_qhttpsocketengine +qt_add_test(tst_qhttpsocketengine SOURCES tst_qhttpsocketengine.cpp INCLUDE_DIRECTORIES @@ -28,7 +28,7 @@ add_qt_test(tst_qhttpsocketengine #### Keys ignored in scope 2:.:.:qhttpsocketengine.pro:LINUX: # QT_TEST_SERVER_LIST = "squid" "danted" "cyrus" "apache2" -extend_target(tst_qhttpsocketengine CONDITION WIN32 +qt_extend_target(tst_qhttpsocketengine CONDITION WIN32 PUBLIC_LIBRARIES ws2_32 ) diff --git a/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt b/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt index cb339eb2fa..5f382b114a 100644 --- a/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt +++ b/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt @@ -4,7 +4,7 @@ ## socketprocess Binary: ##################################################################### -add_qt_executable(socketprocess +qt_add_executable(socketprocess OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/network/socket/qlocalsocket/test/CMakeLists.txt b/tests/auto/network/socket/qlocalsocket/test/CMakeLists.txt index eb427796ae..02017adbca 100644 --- a/tests/auto/network/socket/qlocalsocket/test/CMakeLists.txt +++ b/tests/auto/network/socket/qlocalsocket/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qlocalsocket Test: ##################################################################### -add_qt_test(tst_qlocalsocket +qt_add_test(tst_qlocalsocket SOURCES ../tst_qlocalsocket.cpp DEFINES diff --git a/tests/auto/network/socket/qsctpsocket/CMakeLists.txt b/tests/auto/network/socket/qsctpsocket/CMakeLists.txt index d272d018b6..d2d849aa05 100644 --- a/tests/auto/network/socket/qsctpsocket/CMakeLists.txt +++ b/tests/auto/network/socket/qsctpsocket/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsctpsocket Test: ##################################################################### -add_qt_test(tst_qsctpsocket +qt_add_test(tst_qsctpsocket SOURCES tst_qsctpsocket.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt b/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt index 7c4a56031b..0b2430c81a 100644 --- a/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt +++ b/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qsocks5socketengine Test: ##################################################################### -add_qt_test(tst_qsocks5socketengine +qt_add_test(tst_qsocks5socketengine SOURCES tst_qsocks5socketengine.cpp INCLUDE_DIRECTORIES @@ -28,7 +28,7 @@ add_qt_test(tst_qsocks5socketengine #### Keys ignored in scope 2:.:.:qsocks5socketengine.pro:LINUX: # QT_TEST_SERVER_LIST = "danted" "apache2" "cyrus" -extend_target(tst_qsocks5socketengine CONDITION WIN32 +qt_extend_target(tst_qsocks5socketengine CONDITION WIN32 PUBLIC_LIBRARIES ws2_32 ) diff --git a/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt b/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt index ad291f2ad8..fab02435a6 100644 --- a/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt +++ b/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt @@ -4,7 +4,7 @@ ## crashingServer Binary: ##################################################################### -add_qt_executable(crashingServer +qt_add_executable(crashingServer OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/network/socket/qtcpserver/test/.prev_CMakeLists.txt b/tests/auto/network/socket/qtcpserver/test/.prev_CMakeLists.txt index df05c5012b..f80fdedcac 100644 --- a/tests/auto/network/socket/qtcpserver/test/.prev_CMakeLists.txt +++ b/tests/auto/network/socket/qtcpserver/test/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtcpserver Test: ##################################################################### -add_qt_test(tst_qtcpserver +qt_add_test(tst_qtcpserver SOURCES ../tst_qtcpserver.cpp PUBLIC_LIBRARIES @@ -17,7 +17,7 @@ add_qt_test(tst_qtcpserver ## Scopes: ##################################################################### -extend_target(tst_qtcpserver CONDITION WIN32 +qt_extend_target(tst_qtcpserver CONDITION WIN32 PUBLIC_LIBRARIES ws2_32 ) diff --git a/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt b/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt index b559024724..ae345b99f4 100644 --- a/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt +++ b/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtcpserver Test: ##################################################################### -add_qt_test(tst_qtcpserver +qt_add_test(tst_qtcpserver OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case SOURCES ../tst_qtcpserver.cpp @@ -18,7 +18,7 @@ add_qt_test(tst_qtcpserver ## Scopes: ##################################################################### -extend_target(tst_qtcpserver CONDITION WIN32 +qt_extend_target(tst_qtcpserver CONDITION WIN32 PUBLIC_LIBRARIES ws2_32 ) diff --git a/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt index da9d3a324f..784cee453d 100644 --- a/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt +++ b/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt @@ -4,7 +4,7 @@ ## stressTest Binary: ##################################################################### -add_qt_executable(stressTest +qt_add_executable(stressTest OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES Test.cpp Test.h diff --git a/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt index 61b8d25736..22a105887d 100644 --- a/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt +++ b/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtcpsocket Test: ##################################################################### -add_qt_test(tst_qtcpsocket +qt_add_test(tst_qtcpsocket SOURCES ../tst_qtcpsocket.cpp PUBLIC_LIBRARIES @@ -15,7 +15,7 @@ add_qt_test(tst_qtcpsocket ## Scopes: ##################################################################### -extend_target(tst_qtcpsocket CONDITION WIN32 +qt_extend_target(tst_qtcpsocket CONDITION WIN32 PUBLIC_LIBRARIES ws2_32 ) diff --git a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt index 2acb8b5948..3903670156 100644 --- a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt +++ b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtcpsocket Test: ##################################################################### -add_qt_test(tst_qtcpsocket +qt_add_test(tst_qtcpsocket OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case SOURCES ../tst_qtcpsocket.cpp @@ -16,7 +16,7 @@ add_qt_test(tst_qtcpsocket ## Scopes: ##################################################################### -extend_target(tst_qtcpsocket CONDITION WIN32 +qt_extend_target(tst_qtcpsocket CONDITION WIN32 PUBLIC_LIBRARIES ws2_32 ) diff --git a/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt b/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt index 8b594c6913..12fe8a453a 100644 --- a/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt +++ b/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt @@ -4,7 +4,7 @@ ## clientserver Binary: ##################################################################### -add_qt_executable(clientserver +qt_add_executable(clientserver OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/network/socket/qudpsocket/test/.prev_CMakeLists.txt b/tests/auto/network/socket/qudpsocket/test/.prev_CMakeLists.txt index f5ec5f50ce..4c393d67a8 100644 --- a/tests/auto/network/socket/qudpsocket/test/.prev_CMakeLists.txt +++ b/tests/auto/network/socket/qudpsocket/test/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qudpsocket Test: ##################################################################### -add_qt_test(tst_qudpsocket +qt_add_test(tst_qudpsocket SOURCES ../tst_qudpsocket.cpp INCLUDE_DIRECTORIES diff --git a/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt b/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt index 3c2df284fc..a2fa36b078 100644 --- a/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt +++ b/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qudpsocket Test: ##################################################################### -add_qt_test(tst_qudpsocket +qt_add_test(tst_qudpsocket OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case SOURCES ../tst_qudpsocket.cpp diff --git a/tests/auto/network/socket/qudpsocket/udpServer/.prev_CMakeLists.txt b/tests/auto/network/socket/qudpsocket/udpServer/.prev_CMakeLists.txt index be9819466f..7796fbe476 100644 --- a/tests/auto/network/socket/qudpsocket/udpServer/.prev_CMakeLists.txt +++ b/tests/auto/network/socket/qudpsocket/udpServer/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## udpServer Binary: ##################################################################### -add_qt_executable(udpServer +qt_add_executable(udpServer SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt b/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt index d9da87126f..d4909f94b2 100644 --- a/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt +++ b/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt @@ -4,7 +4,7 @@ ## udpServer Binary: ##################################################################### -add_qt_executable(udpServer +qt_add_executable(udpServer OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./" # special case SOURCES main.cpp |