diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-05-28 16:41:49 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-03 15:14:42 +0200 |
| commit | e4079eca49adce16e31dac2a18d49d7a55817891 (patch) | |
| tree | 1dfb960ec1115b1f552afe8a013058542389505e /tests/auto/network/socket/qtcpsocket/test/test.pro | |
| parent | f32a6cfb6b6236533508901f114ab57396da8ff3 (diff) | |
| parent | ec6dc5f78453048c4f0604655a34c6c20c79d819 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Take 5.
Change-Id: Ifb2d20e95ba824e45e667fba6c2ba45389991cc3
Diffstat (limited to 'tests/auto/network/socket/qtcpsocket/test/test.pro')
| -rw-r--r-- | tests/auto/network/socket/qtcpsocket/test/test.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/network/socket/qtcpsocket/test/test.pro b/tests/auto/network/socket/qtcpsocket/test/test.pro index 29d9414b03..4c07b1ec66 100644 --- a/tests/auto/network/socket/qtcpsocket/test/test.pro +++ b/tests/auto/network/socket/qtcpsocket/test/test.pro @@ -2,8 +2,8 @@ CONFIG += testcase QT = core-private network-private testlib SOURCES += ../tst_qtcpsocket.cpp -win32:LIBS += -lws2_32 +win32: QMAKE_USE += ws2_32 TARGET = tst_qtcpsocket win32 { @@ -18,6 +18,6 @@ win32 { # Only on Linux until cyrus has been added to docker-compose-for-{windows,macOS}.yml and tested linux { + CONFIG += unsupported/testserver QT_TEST_SERVER_LIST = danted squid apache2 ftp-proxy vsftpd iptables cyrus - include($$dirname(_QMAKE_CONF_)/tests/auto/testserver.pri) } |