From 99c3ef0789265bfb06d773b547342a1b0deb2f89 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 17 Jul 2018 15:39:52 +0200 Subject: prune cargo-culted and obsolete winsock deps from autotests Change-Id: I9666598d34e965d7058aeb2b2e7fb3f59600675c Reviewed-by: Timur Pocheptsov --- .../network/socket/platformsocketengine/tst_platformsocketengine.cpp | 4 ---- tests/auto/network/ssl/qdtls/qdtls.pro | 1 - tests/auto/network/ssl/qdtlscookie/qdtlscookie.pro | 1 - tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro | 1 - tests/auto/network/ssl/qsslcipher/qsslcipher.pro | 1 - .../ssl/qssldiffiehellmanparameters/qssldiffiehellmanparameters.pro | 1 - tests/auto/network/ssl/qsslellipticcurve/qsslellipticcurve.pro | 1 - tests/auto/network/ssl/qsslerror/qsslerror.pro | 1 - tests/auto/network/ssl/qsslkey/qsslkey.pro | 1 - tests/auto/network/ssl/qsslsocket/qsslsocket.pro | 1 - .../qsslsocket_onDemandCertificates_member.pro | 1 - .../qsslsocket_onDemandCertificates_static.pro | 1 - 12 files changed, 15 deletions(-) (limited to 'tests/auto/network') diff --git a/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp b/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp index bc53faf106..01168cc0d6 100644 --- a/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp +++ b/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp @@ -29,10 +29,6 @@ #include -#ifdef Q_OS_WIN -#include -#endif - #include #include #include diff --git a/tests/auto/network/ssl/qdtls/qdtls.pro b/tests/auto/network/ssl/qdtls/qdtls.pro index a5f7246c6f..19e13a965c 100644 --- a/tests/auto/network/ssl/qdtls/qdtls.pro +++ b/tests/auto/network/ssl/qdtls/qdtls.pro @@ -1,7 +1,6 @@ CONFIG += testcase SOURCES += tst_qdtls.cpp -win32:LIBS += -lws2_32 QT = core network-private testlib TARGET = tst_qdtls diff --git a/tests/auto/network/ssl/qdtlscookie/qdtlscookie.pro b/tests/auto/network/ssl/qdtlscookie/qdtlscookie.pro index ec7ee2cdf5..4caa89fe49 100644 --- a/tests/auto/network/ssl/qdtlscookie/qdtlscookie.pro +++ b/tests/auto/network/ssl/qdtlscookie/qdtlscookie.pro @@ -1,7 +1,6 @@ CONFIG += testcase SOURCES += tst_qdtlscookie.cpp -win32:LIBS += -lws2_32 QT = core network-private testlib TARGET = tst_qdtlscookie diff --git a/tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro b/tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro index 7c1cd5b66b..7e6870f74b 100644 --- a/tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro +++ b/tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro @@ -1,7 +1,6 @@ CONFIG += testcase SOURCES += tst_qsslcertificate.cpp -win32:LIBS += -lws2_32 QT = core network testlib TARGET = tst_qsslcertificate diff --git a/tests/auto/network/ssl/qsslcipher/qsslcipher.pro b/tests/auto/network/ssl/qsslcipher/qsslcipher.pro index 81ef2d8d9a..392d22c054 100644 --- a/tests/auto/network/ssl/qsslcipher/qsslcipher.pro +++ b/tests/auto/network/ssl/qsslcipher/qsslcipher.pro @@ -1,7 +1,6 @@ CONFIG += testcase SOURCES += tst_qsslcipher.cpp -win32:LIBS += -lws2_32 QT = core network testlib TARGET = tst_qsslcipher diff --git a/tests/auto/network/ssl/qssldiffiehellmanparameters/qssldiffiehellmanparameters.pro b/tests/auto/network/ssl/qssldiffiehellmanparameters/qssldiffiehellmanparameters.pro index dee95886e0..2d45f4476c 100644 --- a/tests/auto/network/ssl/qssldiffiehellmanparameters/qssldiffiehellmanparameters.pro +++ b/tests/auto/network/ssl/qssldiffiehellmanparameters/qssldiffiehellmanparameters.pro @@ -2,7 +2,6 @@ CONFIG += testcase CONFIG += parallel_test SOURCES += tst_qssldiffiehellmanparameters.cpp -win32: LIBS += -lws2_32 QT = core network testlib TARGET = tst_qssldiffiehellmanparameters diff --git a/tests/auto/network/ssl/qsslellipticcurve/qsslellipticcurve.pro b/tests/auto/network/ssl/qsslellipticcurve/qsslellipticcurve.pro index a180086c5e..7eae6ae864 100644 --- a/tests/auto/network/ssl/qsslellipticcurve/qsslellipticcurve.pro +++ b/tests/auto/network/ssl/qsslellipticcurve/qsslellipticcurve.pro @@ -1,7 +1,6 @@ CONFIG += testcase SOURCES += tst_qsslellipticcurve.cpp -win32:LIBS += -lws2_32 QT = core network testlib TARGET = tst_qsslellipticcurve diff --git a/tests/auto/network/ssl/qsslerror/qsslerror.pro b/tests/auto/network/ssl/qsslerror/qsslerror.pro index 117fd4ac27..83644d093c 100644 --- a/tests/auto/network/ssl/qsslerror/qsslerror.pro +++ b/tests/auto/network/ssl/qsslerror/qsslerror.pro @@ -1,7 +1,6 @@ CONFIG += testcase SOURCES += tst_qsslerror.cpp -win32:LIBS += -lws2_32 QT = core network testlib TARGET = tst_qsslerror diff --git a/tests/auto/network/ssl/qsslkey/qsslkey.pro b/tests/auto/network/ssl/qsslkey/qsslkey.pro index 0074513878..8ed65e68ad 100644 --- a/tests/auto/network/ssl/qsslkey/qsslkey.pro +++ b/tests/auto/network/ssl/qsslkey/qsslkey.pro @@ -1,7 +1,6 @@ CONFIG += testcase SOURCES += tst_qsslkey.cpp -win32:LIBS += -lws2_32 QT = core network testlib qtConfig(private_tests) { QT += core-private network-private diff --git a/tests/auto/network/ssl/qsslsocket/qsslsocket.pro b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro index f45857b02d..1260dc9410 100644 --- a/tests/auto/network/ssl/qsslsocket/qsslsocket.pro +++ b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro @@ -1,7 +1,6 @@ CONFIG += testcase SOURCES += tst_qsslsocket.cpp -win32:LIBS += -lws2_32 QT = core core-private network-private testlib TARGET = tst_qsslsocket diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro index c862b3d3ae..05755ff606 100644 --- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro +++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro @@ -2,7 +2,6 @@ CONFIG += testcase testcase.timeout = 300 # this test is slow SOURCES += tst_qsslsocket_onDemandCertificates_member.cpp -win32:LIBS += -lws2_32 QT = core core-private network-private testlib TARGET = tst_qsslsocket_onDemandCertificates_member diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro index c27a58fcd2..c345d7379f 100644 --- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro +++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro @@ -1,7 +1,6 @@ CONFIG += testcase SOURCES += tst_qsslsocket_onDemandCertificates_static.cpp -win32:LIBS += -lws2_32 QT = core core-private network-private testlib TARGET = tst_qsslsocket_onDemandCertificates_static -- cgit v1.2.3