diff options
Diffstat (limited to 'tests/auto/network')
27 files changed, 31 insertions, 77 deletions
diff --git a/tests/auto/network/access/hpack/CMakeLists.txt b/tests/auto/network/access/hpack/CMakeLists.txt index 531246ecf0..e1c5c1a469 100644 --- a/tests/auto/network/access/hpack/CMakeLists.txt +++ b/tests/auto/network/access/hpack/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_hpack SOURCES tst_hpack.cpp - LIBRARIES - Qt::CorePrivate - Qt::NetworkPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Network + Qt::NetworkPrivate ) #### Keys ignored in scope 1:.:.:hpack.pro:<TRUE>: diff --git a/tests/auto/network/access/hsts/CMakeLists.txt b/tests/auto/network/access/hsts/CMakeLists.txt index f2d09a6395..804ebedf61 100644 --- a/tests/auto/network/access/hsts/CMakeLists.txt +++ b/tests/auto/network/access/hsts/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_test(tst_qhsts SOURCES tst_qhsts.cpp - LIBRARIES - Qt::CorePrivate - Qt::NetworkPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Network + Qt::NetworkPrivate ) #### Keys ignored in scope 1:.:.:hsts.pro:<TRUE>: diff --git a/tests/auto/network/access/http2/CMakeLists.txt b/tests/auto/network/access/http2/CMakeLists.txt index 082da570e7..51c7c18eac 100644 --- a/tests/auto/network/access/http2/CMakeLists.txt +++ b/tests/auto/network/access/http2/CMakeLists.txt @@ -13,9 +13,8 @@ add_qt_test(tst_http2 SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" INCLUDE_DIRECTORIES ../../../../shared - LIBRARIES - Qt::CorePrivate - Qt::NetworkPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Network + Qt::NetworkPrivate ) diff --git a/tests/auto/network/access/qftp/CMakeLists.txt b/tests/auto/network/access/qftp/CMakeLists.txt index 4c706febdd..9887e1eea6 100644 --- a/tests/auto/network/access/qftp/CMakeLists.txt +++ b/tests/auto/network/access/qftp/CMakeLists.txt @@ -11,10 +11,9 @@ endif() add_qt_test(tst_qftp SOURCES tst_qftp.cpp - LIBRARIES - Qt::NetworkPrivate PUBLIC_LIBRARIES Qt::Network + Qt::NetworkPrivate ) #### Keys ignored in scope 1:.:.:qftp.pro:<TRUE>: diff --git a/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt b/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt index b1b2059952..6ab8876c82 100644 --- a/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt +++ b/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt @@ -11,11 +11,9 @@ endif() add_qt_test(tst_qhttpnetworkconnection SOURCES tst_qhttpnetworkconnection.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network ) #### Keys ignored in scope 1:.:.:qhttpnetworkconnection.pro:<TRUE>: diff --git a/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt b/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt index c381ec7b3b..8c68a18da6 100644 --- a/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt +++ b/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt @@ -11,11 +11,9 @@ endif() add_qt_test(tst_qhttpnetworkreply SOURCES tst_qhttpnetworkreply.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network ) #### Keys ignored in scope 1:.:.:qhttpnetworkreply.pro:<TRUE>: diff --git a/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt b/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt index a9296cf3f0..929388a10a 100644 --- a/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt +++ b/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt @@ -10,10 +10,9 @@ list(APPEND test_data "parser.json") add_qt_test(tst_qnetworkcookiejar SOURCES tst_qnetworkcookiejar.cpp - LIBRARIES - Qt::CorePrivate - Qt::NetworkPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Network + Qt::NetworkPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt index 97d0da3d34..48759572de 100644 --- a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt +++ b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt @@ -23,11 +23,9 @@ add_qt_test(tst_qnetworkreply ../tst_qnetworkreply.cpp INCLUDE_DIRECTORIES ../../../../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network TESTDATA ${test_data} ) diff --git a/tests/auto/network/bearer/qnetworksession/test/.prev_CMakeLists.txt b/tests/auto/network/bearer/qnetworksession/test/.prev_CMakeLists.txt index 0df7ce71da..e164bccbdf 100644 --- a/tests/auto/network/bearer/qnetworksession/test/.prev_CMakeLists.txt +++ b/tests/auto/network/bearer/qnetworksession/test/.prev_CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_test(tst_qnetworksession SOURCES ../../qbearertestcommon.h tst_qnetworksession.cpp - LIBRARIES - Qt::NetworkPrivate PUBLIC_LIBRARIES Qt::Network + Qt::NetworkPrivate ) ## Scopes: diff --git a/tests/auto/network/bearer/qnetworksession/test/CMakeLists.txt b/tests/auto/network/bearer/qnetworksession/test/CMakeLists.txt index cbc6348d4d..c86966600d 100644 --- a/tests/auto/network/bearer/qnetworksession/test/CMakeLists.txt +++ b/tests/auto/network/bearer/qnetworksession/test/CMakeLists.txt @@ -9,10 +9,9 @@ add_qt_test(tst_qnetworksession SOURCES ../../qbearertestcommon.h tst_qnetworksession.cpp - LIBRARIES - Qt::NetworkPrivate PUBLIC_LIBRARIES Qt::Network + Qt::NetworkPrivate ) ## Scopes: diff --git a/tests/auto/network/kernel/qauthenticator/CMakeLists.txt b/tests/auto/network/kernel/qauthenticator/CMakeLists.txt index 80d6667a21..f461591884 100644 --- a/tests/auto/network/kernel/qauthenticator/CMakeLists.txt +++ b/tests/auto/network/kernel/qauthenticator/CMakeLists.txt @@ -13,10 +13,8 @@ add_qt_test(tst_qauthenticator tst_qauthenticator.cpp DEFINES SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" - LIBRARIES - Qt::NetworkPrivate PUBLIC_LIBRARIES - Qt::Network + Qt::NetworkPrivate ) #### Keys ignored in scope 1:.:.:qauthenticator.pro:<TRUE>: diff --git a/tests/auto/network/kernel/qhostaddress/CMakeLists.txt b/tests/auto/network/kernel/qhostaddress/CMakeLists.txt index 51de80402f..f967625d38 100644 --- a/tests/auto/network/kernel/qhostaddress/CMakeLists.txt +++ b/tests/auto/network/kernel/qhostaddress/CMakeLists.txt @@ -7,10 +7,8 @@ add_qt_test(tst_qhostaddress SOURCES tst_qhostaddress.cpp - LIBRARIES - Qt::NetworkPrivate PUBLIC_LIBRARIES - Qt::Network + Qt::NetworkPrivate ) ## Scopes: diff --git a/tests/auto/network/kernel/qhostinfo/CMakeLists.txt b/tests/auto/network/kernel/qhostinfo/CMakeLists.txt index 60077d0021..19eae0611d 100644 --- a/tests/auto/network/kernel/qhostinfo/CMakeLists.txt +++ b/tests/auto/network/kernel/qhostinfo/CMakeLists.txt @@ -11,11 +11,9 @@ endif() add_qt_test(tst_qhostinfo SOURCES tst_qhostinfo.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network ) #### Keys ignored in scope 1:.:.:qhostinfo.pro:<TRUE>: diff --git a/tests/auto/network/kernel/qnetworkproxyfactory/CMakeLists.txt b/tests/auto/network/kernel/qnetworkproxyfactory/CMakeLists.txt index 3fd139b93e..ecacd338ab 100644 --- a/tests/auto/network/kernel/qnetworkproxyfactory/CMakeLists.txt +++ b/tests/auto/network/kernel/qnetworkproxyfactory/CMakeLists.txt @@ -7,8 +7,6 @@ add_qt_test(tst_qnetworkproxyfactory SOURCES tst_qnetworkproxyfactory.cpp - LIBRARIES - Qt::NetworkPrivate PUBLIC_LIBRARIES - Qt::Network + Qt::NetworkPrivate ) diff --git a/tests/auto/network/socket/platformsocketengine/CMakeLists.txt b/tests/auto/network/socket/platformsocketengine/CMakeLists.txt index bb681d9e2f..1dece78966 100644 --- a/tests/auto/network/socket/platformsocketengine/CMakeLists.txt +++ b/tests/auto/network/socket/platformsocketengine/CMakeLists.txt @@ -13,11 +13,9 @@ add_qt_test(tst_platformsocketengine tst_platformsocketengine.cpp INCLUDE_DIRECTORIES ${QT_SOURCE_TREE}/src/network - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network ) #### Keys ignored in scope 1:.:.:platformsocketengine.pro:<TRUE>: diff --git a/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt b/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt index 8dfa61c5ac..6aeec0a983 100644 --- a/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt +++ b/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt @@ -13,11 +13,9 @@ add_qt_test(tst_qhttpsocketengine tst_qhttpsocketengine.cpp INCLUDE_DIRECTORIES ${QT_SOURCE_TREE}/src/network - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network ) #### Keys ignored in scope 1:.:.:qhttpsocketengine.pro:<TRUE>: diff --git a/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt b/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt index 41a958a36e..fd58b931e6 100644 --- a/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt +++ b/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt @@ -13,11 +13,9 @@ add_qt_test(tst_qsocks5socketengine tst_qsocks5socketengine.cpp INCLUDE_DIRECTORIES ${QT_SOURCE_TREE}/src/network - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network ) #### Keys ignored in scope 1:.:.:qsocks5socketengine.pro:<TRUE>: diff --git a/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt index 238c6b9931..61b8d25736 100644 --- a/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt +++ b/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt @@ -7,11 +7,9 @@ add_qt_test(tst_qtcpsocket SOURCES ../tst_qtcpsocket.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network ) ## Scopes: diff --git a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt index 9523830a15..57fafe7a04 100644 --- a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt +++ b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt @@ -7,11 +7,9 @@ add_qt_test(tst_qtcpsocket SOURCES ../tst_qtcpsocket.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network ) ## Scopes: diff --git a/tests/auto/network/ssl/qasn1element/CMakeLists.txt b/tests/auto/network/ssl/qasn1element/CMakeLists.txt index 70738d6525..aa9ff58012 100644 --- a/tests/auto/network/ssl/qasn1element/CMakeLists.txt +++ b/tests/auto/network/ssl/qasn1element/CMakeLists.txt @@ -7,8 +7,7 @@ add_qt_test(tst_qasn1element SOURCES tst_qasn1element.cpp - LIBRARIES - Qt::NetworkPrivate PUBLIC_LIBRARIES Qt::Network + Qt::NetworkPrivate ) diff --git a/tests/auto/network/ssl/qdtls/CMakeLists.txt b/tests/auto/network/ssl/qdtls/CMakeLists.txt index ce0f029f05..77bf65f199 100644 --- a/tests/auto/network/ssl/qdtls/CMakeLists.txt +++ b/tests/auto/network/ssl/qdtls/CMakeLists.txt @@ -10,10 +10,8 @@ list(APPEND test_data "certs") add_qt_test(tst_qdtls SOURCES tst_qdtls.cpp - LIBRARIES - Qt::NetworkPrivate PUBLIC_LIBRARIES - Qt::Network + Qt::NetworkPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt b/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt index 1df4de743d..827716c3b7 100644 --- a/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt +++ b/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt @@ -7,10 +7,8 @@ add_qt_test(tst_qdtlscookie SOURCES tst_qdtlscookie.cpp - LIBRARIES - Qt::NetworkPrivate PUBLIC_LIBRARIES - Qt::Network + Qt::NetworkPrivate ) ## Scopes: diff --git a/tests/auto/network/ssl/qocsp/CMakeLists.txt b/tests/auto/network/ssl/qocsp/CMakeLists.txt index 4bace58e44..399711f9a0 100644 --- a/tests/auto/network/ssl/qocsp/CMakeLists.txt +++ b/tests/auto/network/ssl/qocsp/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_test(tst_qocsp SOURCES tst_qocsp.cpp - LIBRARIES - Qt::NetworkPrivate PUBLIC_LIBRARIES Qt::Network + Qt::NetworkPrivate ) ## Scopes: diff --git a/tests/auto/network/ssl/qsslkey/CMakeLists.txt b/tests/auto/network/ssl/qsslkey/CMakeLists.txt index 8b16325559..04634d1997 100644 --- a/tests/auto/network/ssl/qsslkey/CMakeLists.txt +++ b/tests/auto/network/ssl/qsslkey/CMakeLists.txt @@ -26,10 +26,7 @@ add_qt_test(tst_qsslkey ##################################################################### extend_target(tst_qsslkey CONDITION QT_FEATURE_private_tests - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Network ) diff --git a/tests/auto/network/ssl/qsslsocket/CMakeLists.txt b/tests/auto/network/ssl/qsslsocket/CMakeLists.txt index 601165d55d..99ec2ad823 100644 --- a/tests/auto/network/ssl/qsslsocket/CMakeLists.txt +++ b/tests/auto/network/ssl/qsslsocket/CMakeLists.txt @@ -16,11 +16,9 @@ add_qt_test(tst_qsslsocket tst_qsslsocket.cpp DEFINES SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network TESTDATA ${test_data} ) diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt index b3d8626da9..c377e0a46a 100644 --- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt +++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt @@ -13,11 +13,9 @@ add_qt_test(tst_qsslsocket_onDemandCertificates_member tst_qsslsocket_onDemandCertificates_member.cpp DEFINES SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network ) #### Keys ignored in scope 1:.:.:qsslsocket_onDemandCertificates_member.pro:<TRUE>: diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt index b71d0a4f8b..f3a3178879 100644 --- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt +++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt @@ -13,11 +13,9 @@ add_qt_test(tst_qsslsocket_onDemandCertificates_static tst_qsslsocket_onDemandCertificates_static.cpp DEFINES SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network ) #### Keys ignored in scope 1:.:.:qsslsocket_onDemandCertificates_static.pro:<TRUE>: |