diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-10-25 14:42:16 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-25 08:42:23 +0200 |
commit | d04bf8f4073aa50b23ae154250932b5ddd3ddc0a (patch) | |
tree | 7a44d578fe0aa03facee96d75eaccbcedfc298fd /tests/auto/network/socket | |
parent | 6b29e881cdd93d8fccec50df9e8d001776800136 (diff) |
all remaining tests: eliminated usage of qttest_p4.prf
qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4.
It enables various crufty undocumented magic, of dubious value.
Stop using it, and explicitly enable the things from it which we want.
Change-Id: I02fe27b2c1800f929250fa8694ca2976c9661a12
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests/auto/network/socket')
8 files changed, 20 insertions, 16 deletions
diff --git a/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro b/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro index bcec77fed2..eee762037d 100644 --- a/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro +++ b/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_platformsocketengine SOURCES += tst_platformsocketengine.cpp include(../platformsocketengine/platformsocketengine.pri) @@ -7,4 +8,4 @@ requires(contains(QT_CONFIG,private_tests)) MOC_DIR=tmp -QT = core-private network-private +QT = core-private network-private testlib diff --git a/tests/auto/network/socket/qabstractsocket/qabstractsocket.pro b/tests/auto/network/socket/qabstractsocket/qabstractsocket.pro index 2066d69238..00e604972f 100644 --- a/tests/auto/network/socket/qabstractsocket/qabstractsocket.pro +++ b/tests/auto/network/socket/qabstractsocket/qabstractsocket.pro @@ -2,8 +2,9 @@ # Project file for autotest for file qabstractsocket.h ############################################################ -load(qttest_p4) -QT = core network +CONFIG += testcase +TARGET = tst_qabstractsocket +QT = core network testlib SOURCES += tst_qabstractsocket.cpp diff --git a/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro b/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro index cc0afb441d..d0649410fa 100644 --- a/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro +++ b/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qhttpsocketengine SOURCES += tst_qhttpsocketengine.cpp @@ -6,5 +7,5 @@ include(../platformsocketengine/platformsocketengine.pri) MOC_DIR=tmp -QT = core-private network-private +QT = core-private network-private testlib diff --git a/tests/auto/network/socket/qlocalsocket/test/test.pro b/tests/auto/network/socket/qlocalsocket/test/test.pro index f8d993bf91..90524958e1 100644 --- a/tests/auto/network/socket/qlocalsocket/test/test.pro +++ b/tests/auto/network/socket/qlocalsocket/test/test.pro @@ -1,4 +1,4 @@ -load(qttest_p4) +CONFIG += testcase DEFINES += QLOCALSERVER_DEBUG DEFINES += QLOCALSOCKET_DEBUG @@ -10,7 +10,7 @@ wince* { DEFINES += SRCDIR=\\\"$$PWD/../\\\" } -QT = core network +QT = core network testlib SOURCES += ../tst_qlocalsocket.cpp diff --git a/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro b/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro index bec8eb8795..f3c24e19fd 100644 --- a/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro +++ b/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsocks5socketengine SOURCES += tst_qsocks5socketengine.cpp @@ -7,6 +8,6 @@ include(../platformsocketengine/platformsocketengine.pri) MOC_DIR=tmp -QT = core-private network-private +QT = core-private network-private testlib requires(contains(QT_CONFIG,private_tests)) diff --git a/tests/auto/network/socket/qtcpserver/test/test.pro b/tests/auto/network/socket/qtcpserver/test/test.pro index 7cac14e645..be0ac1f384 100644 --- a/tests/auto/network/socket/qtcpserver/test/test.pro +++ b/tests/auto/network/socket/qtcpserver/test/test.pro @@ -1,4 +1,4 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += ../tst_qtcpserver.cpp win32: { @@ -22,7 +22,7 @@ win32 { } } -QT = core network +QT = core network testlib MOC_DIR=tmp diff --git a/tests/auto/network/socket/qtcpsocket/test/test.pro b/tests/auto/network/socket/qtcpsocket/test/test.pro index 41ef18a4d8..13c39471b3 100644 --- a/tests/auto/network/socket/qtcpsocket/test/test.pro +++ b/tests/auto/network/socket/qtcpsocket/test/test.pro @@ -1,6 +1,6 @@ -load(qttest_p4) +CONFIG += testcase -QT += widgets +QT += widgets testlib QT += core-private network-private SOURCES += ../tst_qtcpsocket.cpp win32: { diff --git a/tests/auto/network/socket/qudpsocket/test/test.pro b/tests/auto/network/socket/qudpsocket/test/test.pro index 2bc074d9f6..6ff5dca813 100644 --- a/tests/auto/network/socket/qudpsocket/test/test.pro +++ b/tests/auto/network/socket/qudpsocket/test/test.pro @@ -1,6 +1,6 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += ../tst_qudpsocket.cpp -QT = core network +QT = core network testlib MOC_DIR=tmp |