From 403213240c7b2dc09378e1cb8c147131e368f90c Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 22 Sep 2020 10:16:58 +0200 Subject: CMake: Regenerate projects to use new qt_internal_ API Modify special case locations to use the new API as well. Clean up some stale .prev files that are not needed anymore. Clean up some project files that are not used anymore. Task-number: QTBUG-86815 Change-Id: I9947da921f98686023c6bb053dfcc101851276b5 Reviewed-by: Joerg Bornemann Reviewed-by: Qt CI Bot --- tests/auto/network/socket/platformsocketengine/CMakeLists.txt | 4 ++-- tests/auto/network/socket/qabstractsocket/CMakeLists.txt | 2 +- tests/auto/network/socket/qhttpsocketengine/.prev_CMakeLists.txt | 4 ++-- tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt | 4 ++-- tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt | 2 +- tests/auto/network/socket/qlocalsocket/test/CMakeLists.txt | 2 +- tests/auto/network/socket/qsctpsocket/CMakeLists.txt | 2 +- tests/auto/network/socket/qsocks5socketengine/.prev_CMakeLists.txt | 4 ++-- tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt | 4 ++-- tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt | 2 +- tests/auto/network/socket/qtcpserver/test/.prev_CMakeLists.txt | 4 ++-- tests/auto/network/socket/qtcpserver/test/CMakeLists.txt | 4 ++-- tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt | 2 +- tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt | 4 ++-- tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt | 4 ++-- tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt | 2 +- tests/auto/network/socket/qudpsocket/test/.prev_CMakeLists.txt | 2 +- tests/auto/network/socket/qudpsocket/test/CMakeLists.txt | 2 +- tests/auto/network/socket/qudpsocket/udpServer/.prev_CMakeLists.txt | 2 +- tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt | 2 +- 20 files changed, 29 insertions(+), 29 deletions(-) (limited to 'tests/auto/network/socket') diff --git a/tests/auto/network/socket/platformsocketengine/CMakeLists.txt b/tests/auto/network/socket/platformsocketengine/CMakeLists.txt index 780826f211..21bc3e2c80 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: ##################################################################### -qt_add_test(tst_platformsocketengine +qt_internal_add_test(tst_platformsocketengine SOURCES tst_platformsocketengine.cpp INCLUDE_DIRECTORIES @@ -25,7 +25,7 @@ qt_add_test(tst_platformsocketengine ## Scopes: ##################################################################### -qt_extend_target(tst_platformsocketengine CONDITION WIN32 +qt_internal_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 b5de9360c3..ee83261ab0 100644 --- a/tests/auto/network/socket/qabstractsocket/CMakeLists.txt +++ b/tests/auto/network/socket/qabstractsocket/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstractsocket Test: ##################################################################### -qt_add_test(tst_qabstractsocket +qt_internal_add_test(tst_qabstractsocket SOURCES tst_qabstractsocket.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/socket/qhttpsocketengine/.prev_CMakeLists.txt b/tests/auto/network/socket/qhttpsocketengine/.prev_CMakeLists.txt index 8afcdc3376..cb36b4c6e0 100644 --- a/tests/auto/network/socket/qhttpsocketengine/.prev_CMakeLists.txt +++ b/tests/auto/network/socket/qhttpsocketengine/.prev_CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qhttpsocketengine Test: ##################################################################### -qt_add_test(tst_qhttpsocketengine +qt_internal_add_test(tst_qhttpsocketengine SOURCES tst_qhttpsocketengine.cpp INCLUDE_DIRECTORIES @@ -28,7 +28,7 @@ qt_add_test(tst_qhttpsocketengine #### Keys ignored in scope 2:.:.:qhttpsocketengine.pro:LINUX: # QT_TEST_SERVER_LIST = "squid" "danted" "cyrus" "apache2" -qt_extend_target(tst_qhttpsocketengine CONDITION WIN32 +qt_internal_extend_target(tst_qhttpsocketengine CONDITION WIN32 PUBLIC_LIBRARIES ws2_32 ) diff --git a/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt b/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt index 5b4a9d0195..1d8e759f26 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: ##################################################################### -qt_add_test(tst_qhttpsocketengine +qt_internal_add_test(tst_qhttpsocketengine SOURCES tst_qhttpsocketengine.cpp INCLUDE_DIRECTORIES @@ -29,7 +29,7 @@ qt_add_test(tst_qhttpsocketengine #### Keys ignored in scope 2:.:.:qhttpsocketengine.pro:LINUX: # QT_TEST_SERVER_LIST = "squid" "danted" "cyrus" "apache2" -qt_extend_target(tst_qhttpsocketengine CONDITION WIN32 +qt_internal_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 5f382b114a..adf1752ac0 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: ##################################################################### -qt_add_executable(socketprocess +qt_internal_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 02017adbca..3a2899239f 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: ##################################################################### -qt_add_test(tst_qlocalsocket +qt_internal_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 d2d849aa05..af3f809113 100644 --- a/tests/auto/network/socket/qsctpsocket/CMakeLists.txt +++ b/tests/auto/network/socket/qsctpsocket/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsctpsocket Test: ##################################################################### -qt_add_test(tst_qsctpsocket +qt_internal_add_test(tst_qsctpsocket SOURCES tst_qsctpsocket.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/socket/qsocks5socketengine/.prev_CMakeLists.txt b/tests/auto/network/socket/qsocks5socketengine/.prev_CMakeLists.txt index 0b2430c81a..851e81a40d 100644 --- a/tests/auto/network/socket/qsocks5socketengine/.prev_CMakeLists.txt +++ b/tests/auto/network/socket/qsocks5socketengine/.prev_CMakeLists.txt @@ -8,7 +8,7 @@ endif() ## tst_qsocks5socketengine Test: ##################################################################### -qt_add_test(tst_qsocks5socketengine +qt_internal_add_test(tst_qsocks5socketengine SOURCES tst_qsocks5socketengine.cpp INCLUDE_DIRECTORIES @@ -28,7 +28,7 @@ qt_add_test(tst_qsocks5socketengine #### Keys ignored in scope 2:.:.:qsocks5socketengine.pro:LINUX: # QT_TEST_SERVER_LIST = "danted" "apache2" "cyrus" -qt_extend_target(tst_qsocks5socketengine CONDITION WIN32 +qt_internal_extend_target(tst_qsocks5socketengine CONDITION WIN32 PUBLIC_LIBRARIES ws2_32 ) diff --git a/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt b/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt index e46257c123..47c7698f94 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: ##################################################################### -qt_add_test(tst_qsocks5socketengine +qt_internal_add_test(tst_qsocks5socketengine SOURCES tst_qsocks5socketengine.cpp INCLUDE_DIRECTORIES @@ -29,7 +29,7 @@ qt_add_test(tst_qsocks5socketengine #### Keys ignored in scope 2:.:.:qsocks5socketengine.pro:LINUX: # QT_TEST_SERVER_LIST = "danted" "apache2" "cyrus" -qt_extend_target(tst_qsocks5socketengine CONDITION WIN32 +qt_internal_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 fab02435a6..dd309ba605 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: ##################################################################### -qt_add_executable(crashingServer +qt_internal_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 f80fdedcac..f842fda311 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: ##################################################################### -qt_add_test(tst_qtcpserver +qt_internal_add_test(tst_qtcpserver SOURCES ../tst_qtcpserver.cpp PUBLIC_LIBRARIES @@ -17,7 +17,7 @@ qt_add_test(tst_qtcpserver ## Scopes: ##################################################################### -qt_extend_target(tst_qtcpserver CONDITION WIN32 +qt_internal_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 4d328ebddb..74aed77c95 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: ##################################################################### -qt_add_test(tst_qtcpserver +qt_internal_add_test(tst_qtcpserver OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case SOURCES ../tst_qtcpserver.cpp @@ -19,7 +19,7 @@ qt_add_test(tst_qtcpserver ## Scopes: ##################################################################### -qt_extend_target(tst_qtcpserver CONDITION WIN32 +qt_internal_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 784cee453d..950c4356e2 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: ##################################################################### -qt_add_executable(stressTest +qt_internal_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 22a105887d..e27383cf94 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: ##################################################################### -qt_add_test(tst_qtcpsocket +qt_internal_add_test(tst_qtcpsocket SOURCES ../tst_qtcpsocket.cpp PUBLIC_LIBRARIES @@ -15,7 +15,7 @@ qt_add_test(tst_qtcpsocket ## Scopes: ##################################################################### -qt_extend_target(tst_qtcpsocket CONDITION WIN32 +qt_internal_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 3b4bd856a3..759f655417 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: ##################################################################### -qt_add_test(tst_qtcpsocket +qt_internal_add_test(tst_qtcpsocket OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case SOURCES ../tst_qtcpsocket.cpp @@ -17,7 +17,7 @@ qt_add_test(tst_qtcpsocket ## Scopes: ##################################################################### -qt_extend_target(tst_qtcpsocket CONDITION WIN32 +qt_internal_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 12fe8a453a..7c8b924ca9 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: ##################################################################### -qt_add_executable(clientserver +qt_internal_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 4c393d67a8..2ef2d8a796 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: ##################################################################### -qt_add_test(tst_qudpsocket +qt_internal_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 3da08a0e72..7bd9bd80fb 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: ##################################################################### -qt_add_test(tst_qudpsocket +qt_internal_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 7796fbe476..00b7ce272e 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: ##################################################################### -qt_add_executable(udpServer +qt_internal_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 d4909f94b2..4afeb529a7 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: ##################################################################### -qt_add_executable(udpServer +qt_internal_add_executable(udpServer OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./" # special case SOURCES main.cpp -- cgit v1.2.3