From 95cebd34ebc5b4d39b11dc91610309a35e488663 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Tue, 27 Sep 2011 19:53:01 +1000 Subject: Remove Symbian-specific code from tests. Symbian is not a supported platform for Qt5, so this code is no longer required. Change-Id: I1172e6a42d518490e63e9599bf10579df08259aa Reviewed-on: http://codereview.qt-project.org/5657 Reviewed-by: Rohan McGovern --- .../platformsocketengine/platformsocketengine.pro | 6 -- .../tst_platformsocketengine.cpp | 77 +---------------- .../socket/qabstractsocket/qabstractsocket.pro | 2 - .../socket/qhttpsocketengine/qhttpsocketengine.pro | 3 - .../qhttpsocketengine/tst_qhttpsocketengine.cpp | 3 +- .../network/socket/qlocalsocket/lackey/lackey.pro | 2 - .../network/socket/qlocalsocket/qlocalsocket.pro | 3 +- .../auto/network/socket/qlocalsocket/test/test.pro | 13 +-- .../socket/qlocalsocket/tst_qlocalsocket.cpp | 94 +-------------------- .../qsocks5socketengine/qsocks5socketengine.pro | 5 -- .../tst_qsocks5socketengine.cpp | 7 +- .../qtcpserver/crashingServer/crashingServer.pro | 1 - .../socket/qtcpserver/crashingServer/main.cpp | 2 +- tests/auto/network/socket/qtcpserver/test/test.pro | 7 -- .../network/socket/qtcpserver/tst_qtcpserver.cpp | 27 +----- .../auto/network/socket/qtcpsocket/qtcpsocket.pro | 2 +- .../socket/qtcpsocket/stressTest/stressTest.pro | 3 - tests/auto/network/socket/qtcpsocket/test/test.pro | 5 -- .../network/socket/qtcpsocket/tst_qtcpsocket.cpp | 45 +--------- .../qudpsocket/clientserver/clientserver.pro | 2 - tests/auto/network/socket/qudpsocket/test/test.pro | 5 +- .../network/socket/qudpsocket/tst_qudpsocket.cpp | 98 ++-------------------- .../socket/qudpsocket/udpServer/udpServer.pro | 2 - 23 files changed, 22 insertions(+), 392 deletions(-) (limited to 'tests/auto/network/socket') diff --git a/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro b/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro index 99ae358a93..bcec77fed2 100644 --- a/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro +++ b/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro @@ -8,9 +8,3 @@ requires(contains(QT_CONFIG,private_tests)) MOC_DIR=tmp QT = core-private network-private - -symbian { - TARGET.CAPABILITY = NetworkServices - INCLUDEPATH += $$OS_LAYER_SYSTEMINCLUDE - LIBS += -lesock -} diff --git a/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp b/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp index 9e93108fc7..b362e6b08c 100644 --- a/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp +++ b/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #include #ifdef Q_OS_WIN @@ -47,10 +46,7 @@ #endif #include - - #include - #include #include @@ -62,20 +58,9 @@ #include -#ifdef Q_OS_SYMBIAN -#include -#include -#include -#include -#define PLATFORMSOCKETENGINE QSymbianSocketEngine -#define PLATFORMSOCKETENGINESTRING "QSymbianSocketEngine" -#include -#include -#else #define PLATFORMSOCKETENGINE QNativeSocketEngine #define PLATFORMSOCKETENGINESTRING "QNativeSocketEngine" #include -#endif #include @@ -115,7 +100,6 @@ private slots: tst_PlatformSocketEngine::tst_PlatformSocketEngine() { - Q_SET_DEFAULT_IAP } tst_PlatformSocketEngine::~tst_PlatformSocketEngine() @@ -314,20 +298,6 @@ void tst_PlatformSocketEngine::udpIPv6LoopbackTest() //--------------------------------------------------------------------------- void tst_PlatformSocketEngine::broadcastTest() { -#ifdef Q_OS_SYMBIAN - //broadcast isn't supported on loopback connections, but is on WLAN -#ifndef QT_NO_BEARERMANAGEMENT - QScopedPointer netConfMan(new QNetworkConfigurationManager()); - QNetworkConfiguration networkConfiguration(netConfMan->defaultConfiguration()); - QScopedPointer networkSession(new QNetworkSession(networkConfiguration)); - if (!networkSession->isOpen()) { - networkSession->open(); - bool ok = networkSession->waitForOpened(30000); - qDebug() << networkSession->isOpen() << networkSession->error() << networkSession->errorString(); - QVERIFY(ok); - } -#endif -#endif #ifdef Q_OS_AIX QSKIP("Broadcast does not work on darko", SkipAll); #endif @@ -350,12 +320,6 @@ void tst_PlatformSocketEngine::broadcastTest() QHostAddress::Broadcast, port); -#ifdef Q_OS_SYMBIAN - //On symbian, broadcasts return 0 bytes written if none of the interfaces support it. - //Notably the loopback interfaces do not. (though they do support multicast!?) - if (written == 0) - QEXPECT_FAIL("", "No active interface supports broadcast", Abort); -#endif QCOMPARE((int)written, trollMessage.size()); // Wait until we receive it ourselves @@ -431,9 +395,6 @@ void tst_PlatformSocketEngine::serverTest() //--------------------------------------------------------------------------- void tst_PlatformSocketEngine::udpLoopbackPerformance() { -#ifdef SYMBIAN_WINSOCK_CONNECTIVITY - QSKIP("Not working on Emulator without WinPCAP", SkipAll); -#endif PLATFORMSOCKETENGINE udpSocket; // Initialize device #1 @@ -520,11 +481,7 @@ void tst_PlatformSocketEngine::tcpLoopbackPerformance() QVERIFY(serverSocket.initialize(socketDescriptor)); QVERIFY(serverSocket.state() == QAbstractSocket::ConnectedState); -#if defined (Q_OS_SYMBIAN) && defined (__WINS__) - const int messageSize = 1024 * 16; -#else const int messageSize = 1024 * 256; -#endif QByteArray message1(messageSize, '@'); QByteArray answer(messageSize, '@'); @@ -595,7 +552,7 @@ void tst_PlatformSocketEngine::tooManySockets() //--------------------------------------------------------------------------- void tst_PlatformSocketEngine::bind() { -#if !defined Q_OS_WIN && !defined Q_OS_SYMBIAN +#if !defined Q_OS_WIN PLATFORMSOCKETENGINE binder; QVERIFY(binder.initialize(QAbstractSocket::TcpSocket, QAbstractSocket::IPv4Protocol)); QVERIFY(!binder.bind(QHostAddress::Any, 82)); @@ -609,13 +566,7 @@ void tst_PlatformSocketEngine::bind() PLATFORMSOCKETENGINE binder3; QVERIFY(binder3.initialize(QAbstractSocket::TcpSocket, QAbstractSocket::IPv4Protocol)); QVERIFY(!binder3.bind(QHostAddress::Any, 31180)); - -#ifdef SYMBIAN_WINSOCK_CONNECTIVITY - qDebug("On Symbian Emulator (WinSock) we get EADDRNOTAVAIL instead of EADDRINUSE"); - QVERIFY(binder3.error() == QAbstractSocket::SocketAddressNotAvailableError); -#else QVERIFY(binder3.error() == QAbstractSocket::AddressInUseError); -#endif } //--------------------------------------------------------------------------- @@ -637,12 +588,6 @@ void tst_PlatformSocketEngine::networkError() #ifdef Q_OS_WIN // could use shutdown to produce different errors ::closesocket(client.socketDescriptor()); -#elif defined(Q_OS_SYMBIAN) - RSocket sock; - QVERIFY(QSymbianSocketManager::instance().lookupSocket(client.socketDescriptor(), sock)); - TRequestStatus stat; - sock.Shutdown(RSocket::EImmediate, stat); - User::WaitForRequest(stat); #else ::close(client.socketDescriptor()); #endif @@ -715,18 +660,7 @@ void tst_PlatformSocketEngine::receiveUrgentData() // The server sends an urgent message msg = 'Q'; -#if defined(Q_OS_SYMBIAN) - RSocket sock; - QVERIFY(QSymbianSocketManager::instance().lookupSocket(socketDescriptor, sock)); - TRequestStatus stat; - TSockXfrLength len; - sock.Send(TPtrC8((TUint8*)&msg,1), KSockWriteUrgent, stat, len); - User::WaitForRequest(stat); - QVERIFY(stat == KErrNone); - QCOMPARE(len(), 1); -#else QCOMPARE(int(::send(socketDescriptor, &msg, sizeof(msg), MSG_OOB)), 1); -#endif // The client receives the urgent message QVERIFY(client.waitForRead()); @@ -739,15 +673,7 @@ void tst_PlatformSocketEngine::receiveUrgentData() // The client sends an urgent message msg = 'T'; int clientDescriptor = client.socketDescriptor(); -#if defined(Q_OS_SYMBIAN) - QVERIFY(QSymbianSocketManager::instance().lookupSocket(clientDescriptor, sock)); - sock.Send(TPtrC8((TUint8*)&msg,1), KSockWriteUrgent, stat, len); - User::WaitForRequest(stat); - QVERIFY(stat == KErrNone); - QCOMPARE(len(), 1); -#else QCOMPARE(int(::send(clientDescriptor, &msg, sizeof(msg), MSG_OOB)), 1); -#endif // The server receives the urgent message QVERIFY(serverSocket.waitForRead()); @@ -756,7 +682,6 @@ void tst_PlatformSocketEngine::receiveUrgentData() response.resize(available); QCOMPARE(serverSocket.read(response.data(), response.size()), qint64(1)); QCOMPARE(response.at(0), msg); - } QTEST_MAIN(tst_PlatformSocketEngine) diff --git a/tests/auto/network/socket/qabstractsocket/qabstractsocket.pro b/tests/auto/network/socket/qabstractsocket/qabstractsocket.pro index 814a7d2600..2066d69238 100644 --- a/tests/auto/network/socket/qabstractsocket/qabstractsocket.pro +++ b/tests/auto/network/socket/qabstractsocket/qabstractsocket.pro @@ -7,5 +7,3 @@ QT = core network SOURCES += tst_qabstractsocket.cpp -symbian: TARGET.CAPABILITY = NetworkServices - diff --git a/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro b/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro index f26abbe8d9..cc0afb441d 100644 --- a/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro +++ b/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro @@ -8,6 +8,3 @@ MOC_DIR=tmp QT = core-private network-private -symbian: TARGET.CAPABILITY = NetworkServices - - diff --git a/tests/auto/network/socket/qhttpsocketengine/tst_qhttpsocketengine.cpp b/tests/auto/network/socket/qhttpsocketengine/tst_qhttpsocketengine.cpp index 5a90abea0e..92da0e865b 100644 --- a/tests/auto/network/socket/qhttpsocketengine/tst_qhttpsocketengine.cpp +++ b/tests/auto/network/socket/qhttpsocketengine/tst_qhttpsocketengine.cpp @@ -141,7 +141,6 @@ public slots: tst_QHttpSocketEngine::tst_QHttpSocketEngine() { - Q_SET_DEFAULT_IAP } tst_QHttpSocketEngine::~tst_QHttpSocketEngine() @@ -654,7 +653,7 @@ void tst_QHttpSocketEngine::downloadBigFile() QTime stopWatch; stopWatch.start(); -#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WINCE) QTestEventLoop::instance().enterLoop(240); #else QTestEventLoop::instance().enterLoop(60); diff --git a/tests/auto/network/socket/qlocalsocket/lackey/lackey.pro b/tests/auto/network/socket/qlocalsocket/lackey/lackey.pro index 2573222c8b..858f22b199 100644 --- a/tests/auto/network/socket/qlocalsocket/lackey/lackey.pro +++ b/tests/auto/network/socket/qlocalsocket/lackey/lackey.pro @@ -12,5 +12,3 @@ DEFINES += QLOCALSOCKET_DEBUG SOURCES += main.cpp TARGET = lackey - -symbian:TARGET.CAPABILITY = ALL -TCB diff --git a/tests/auto/network/socket/qlocalsocket/qlocalsocket.pro b/tests/auto/network/socket/qlocalsocket/qlocalsocket.pro index 931c1e0602..5b86ec9463 100644 --- a/tests/auto/network/socket/qlocalsocket/qlocalsocket.pro +++ b/tests/auto/network/socket/qlocalsocket/qlocalsocket.pro @@ -1,4 +1,3 @@ TEMPLATE = subdirs SUBDIRS = test # lackey should be moved to the QtScript module -!wince*:!symbian: SUBDIRS += example -symbian: TARGET.CAPABILITY = NetworkServices +!wince*: SUBDIRS += example diff --git a/tests/auto/network/socket/qlocalsocket/test/test.pro b/tests/auto/network/socket/qlocalsocket/test/test.pro index b2755b5411..f8d993bf91 100644 --- a/tests/auto/network/socket/qlocalsocket/test/test.pro +++ b/tests/auto/network/socket/qlocalsocket/test/test.pro @@ -3,9 +3,7 @@ load(qttest_p4) DEFINES += QLOCALSERVER_DEBUG DEFINES += QLOCALSOCKET_DEBUG -symbian { - # nothing -} else:wince* { +wince* { DEFINES += QT_LOCALSOCKET_TCP DEFINES += SRCDIR=\\\"../\\\" } else { @@ -32,14 +30,7 @@ wince* { additionalFiles.path = lackey } -symbian { - additionalFiles.files = lackey.exe - additionalFiles.path = \\sys\\bin - TARGET.UID3 = 0xE0340005 - DEFINES += SYMBIAN_SRCDIR_UID=$$lower($$replace(TARGET.UID3,"0x","")) -} - -wince*|symbian { +wince* { scriptFiles.files = ../lackey/scripts/*.js scriptFiles.path = lackey/scripts DEPLOYMENT += additionalFiles scriptFiles diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp index 57daa92f82..fca2127fec 100644 --- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp +++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp @@ -47,16 +47,9 @@ #include #include "../../../../shared/util.h" -#ifdef Q_OS_SYMBIAN - #include -#endif //TESTED_CLASS=QLocalServer, QLocalSocket //TESTED_FILES=network/socket/qlocalserver.cpp network/socket/qlocalsocket.cpp -#ifdef Q_OS_SYMBIAN - #define STRINGIFY(x) #x - #define TOSTRING(x) STRINGIFY(x) - #define SRCDIR "C:/Private/" TOSTRING(SYMBIAN_SRCDIR_UID) "/" -#endif + Q_DECLARE_METATYPE(QLocalSocket::LocalSocketError) Q_DECLARE_METATYPE(QLocalSocket::LocalSocketState) @@ -117,11 +110,6 @@ private slots: void bytesWrittenSignal(); void syncDisconnectNotify(); void asyncDisconnectNotify(); - -#ifdef Q_OS_SYMBIAN -private: - void unlink(QString serverName); -#endif }; tst_QLocalSocket::tst_QLocalSocket() @@ -308,9 +296,6 @@ void tst_QLocalSocket::listen() QSignalSpy spyNewConnection(&server, SIGNAL(newConnection())); QFETCH(QString, name); -#ifdef Q_OS_SYMBIAN - unlink(name); -#endif QFETCH(bool, canListen); QFETCH(bool, close); QVERIFY2((server.listen(name) == canListen), server.errorString().toLatin1().constData()); @@ -361,9 +346,6 @@ void tst_QLocalSocket::listenAndConnect() QFETCH(QString, name); QFETCH(bool, canListen); -#ifdef Q_OS_SYMBIAN - unlink(name); -#endif QCOMPARE(server.listen(name), canListen); QTest::qWait(1000); //QVERIFY(!server.errorString().isEmpty()); @@ -488,9 +470,6 @@ void tst_QLocalSocket::sendData_data() void tst_QLocalSocket::sendData() { QFETCH(QString, name); -#ifdef Q_OS_SYMBIAN - unlink(name); -#endif QFETCH(bool, canListen); LocalServer server; @@ -521,11 +500,7 @@ void tst_QLocalSocket::sendData() // test sending/receiving data if (server.hasPendingConnections()) { QString testLine = "test"; -#ifdef Q_OS_SYMBIAN - for (int i = 0; i < 25 * 1024; ++i) -#else for (int i = 0; i < 50000; ++i) -#endif testLine += "a"; QLocalSocket *serverSocket = server.nextPendingConnection(); QVERIFY(serverSocket); @@ -607,9 +582,7 @@ void tst_QLocalSocket::fullPath() { QLocalServer server; QString name = "qlocalsocket_pathtest"; -#if defined(Q_OS_SYMBIAN) - QString path = ""; -#elif defined(QT_LOCALSOCKET_TCP) +#if defined(QT_LOCALSOCKET_TCP) QString path = "QLocalServer"; #elif defined(Q_OS_WIN) QString path = "\\\\.\\pipe\\"; @@ -647,9 +620,6 @@ void tst_QLocalSocket::hitMaximumConnections() QFETCH(int, max); LocalServer server; QString name = "tst_localsocket"; -#ifdef Q_OS_SYMBIAN - unlink(name); -#endif server.setMaxPendingConnections(max); QVERIFY2(server.listen(name), server.errorString().toLatin1().constData()); int connections = server.maxPendingConnections() + 1; @@ -749,15 +719,8 @@ void tst_QLocalSocket::threadedConnection_data() void tst_QLocalSocket::threadedConnection() { -#ifdef Q_OS_SYMBIAN - unlink("qlocalsocket_threadtest"); -#endif - QFETCH(int, threads); Server server; -#if defined(Q_OS_SYMBIAN) - server.setStackSize(0x14000); -#endif server.clients = threads; server.mutex.lock(); server.start(); @@ -766,9 +729,6 @@ void tst_QLocalSocket::threadedConnection() QList clients; for (int i = 0; i < threads; ++i) { clients.append(new Client()); -#if defined(Q_OS_SYMBIAN) - clients.last()->setStackSize(0x14000); -#endif clients.last()->start(); } @@ -795,7 +755,7 @@ void tst_QLocalSocket::processConnection_data() */ void tst_QLocalSocket::processConnection() { -#if defined(QT_NO_PROCESS) || defined(Q_CC_NOKIAX86) +#if defined(QT_NO_PROCESS) QSKIP("Qt was compiled with QT_NO_PROCESS", SkipAll); #else QFETCH(int, processes); @@ -850,9 +810,6 @@ void tst_QLocalSocket::longPath() void tst_QLocalSocket::waitForDisconnect() { QString name = "tst_localsocket"; -#ifdef Q_OS_SYMBIAN - unlink(name); -#endif LocalServer server; QVERIFY(server.listen(name)); LocalSocket socket; @@ -904,10 +861,6 @@ void tst_QLocalSocket::removeServer() void tst_QLocalSocket::recycleServer() { -#ifdef Q_OS_SYMBIAN - unlink("recycletest1"); -#endif - QLocalServer server; QLocalSocket client; @@ -956,17 +909,11 @@ void tst_QLocalSocket::multiConnect() void tst_QLocalSocket::writeOnlySocket() { QLocalServer server; -#ifdef Q_OS_SYMBIAN - unlink("writeOnlySocket"); -#endif QVERIFY(server.listen("writeOnlySocket")); QLocalSocket client; client.connectToServer("writeOnlySocket", QIODevice::WriteOnly); QVERIFY(client.waitForConnected()); -#if defined(Q_OS_SYMBIAN) - QTest::qWait(250); -#endif QVERIFY(server.waitForNewConnection(200)); QLocalSocket* serverSocket = server.nextPendingConnection(); QVERIFY(serverSocket); @@ -977,10 +924,6 @@ void tst_QLocalSocket::writeOnlySocket() void tst_QLocalSocket::writeToClientAndDisconnect() { -#ifdef Q_OS_SYMBIAN - unlink("writeAndDisconnectServer"); -#endif - QLocalServer server; QLocalSocket client; QSignalSpy readChannelFinishedSpy(&client, SIGNAL(readChannelFinished())); @@ -1059,10 +1002,6 @@ void tst_QLocalSocket::bytesWrittenSignal() void tst_QLocalSocket::syncDisconnectNotify() { -#ifdef Q_OS_SYMBIAN - unlink("syncDisconnectNotify"); -#endif - QLocalServer server; QVERIFY(server.listen("syncDisconnectNotify")); QLocalSocket client; @@ -1076,10 +1015,6 @@ void tst_QLocalSocket::syncDisconnectNotify() void tst_QLocalSocket::asyncDisconnectNotify() { -#ifdef Q_OS_SYMBIAN - unlink("asyncDisconnectNotify"); -#endif - QLocalServer server; QVERIFY(server.listen("asyncDisconnectNotify")); QLocalSocket client; @@ -1092,29 +1027,6 @@ void tst_QLocalSocket::asyncDisconnectNotify() QTRY_VERIFY(!disconnectedSpy.isEmpty()); } -#ifdef Q_OS_SYMBIAN -void tst_QLocalSocket::unlink(QString name) -{ - if(name.length() == 0) - return; - - QString fullName; - // determine the full server path - if (name.startsWith(QLatin1Char('/'))) { - fullName = name; - } else { - fullName = QDir::cleanPath(QDir::tempPath()); - fullName += QLatin1Char('/') + name; - fullName = QDir::toNativeSeparators(fullName); - } - - int result = ::unlink(fullName.toUtf8().data()); - - if(result != 0) { - qWarning() << "Unlinking " << fullName << " failed with " << strerror(errno); - } -} -#endif QTEST_MAIN(tst_QLocalSocket) #include "tst_qlocalsocket.moc" diff --git a/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro b/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro index 3a144aeacf..bec8eb8795 100644 --- a/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro +++ b/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro @@ -9,9 +9,4 @@ MOC_DIR=tmp QT = core-private network-private -# Symbian toolchain does not support correct include semantics -symbian:INCLUDEPATH+=..\\..\\..\\include\\QtNetwork\\private -symbian: TARGET.CAPABILITY = NetworkServices - - requires(contains(QT_CONFIG,private_tests)) diff --git a/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp index 2678816482..d738926ca8 100644 --- a/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp +++ b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp @@ -151,7 +151,6 @@ private slots: tst_QSocks5SocketEngine::tst_QSocks5SocketEngine() { - Q_SET_DEFAULT_IAP } tst_QSocks5SocketEngine::~tst_QSocks5SocketEngine() @@ -532,10 +531,6 @@ void tst_QSocks5SocketEngine::serverTest() //--------------------------------------------------------------------------- void tst_QSocks5SocketEngine::udpTest() { -#ifdef SYMBIAN_WINSOCK_CONNECTIVITY - QSKIP("UDP works bads on non WinPCAP emulator setting", SkipAll); -#endif - QSocks5SocketEngine udpSocket; // Initialize device #1 @@ -795,7 +790,7 @@ void tst_QSocks5SocketEngine::downloadBigFile() QTime stopWatch; stopWatch.start(); -#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) +#if !defined(Q_OS_WINCE) QTestEventLoop::instance().enterLoop(60); #else QTestEventLoop::instance().enterLoop(180); diff --git a/tests/auto/network/socket/qtcpserver/crashingServer/crashingServer.pro b/tests/auto/network/socket/qtcpserver/crashingServer/crashingServer.pro index 700e9520ec..0bea655187 100644 --- a/tests/auto/network/socket/qtcpserver/crashingServer/crashingServer.pro +++ b/tests/auto/network/socket/qtcpserver/crashingServer/crashingServer.pro @@ -6,4 +6,3 @@ DESTDIR = ./ # This means the auto test works on some machines for MinGW. No dialog stalls # the application. win32-g++*:CONFIG += console -symbian: TARGET.CAPABILITY += NetworkServices ReadUserData diff --git a/tests/auto/network/socket/qtcpserver/crashingServer/main.cpp b/tests/auto/network/socket/qtcpserver/crashingServer/main.cpp index 35da65f671..e223bff8c5 100644 --- a/tests/auto/network/socket/qtcpserver/crashingServer/main.cpp +++ b/tests/auto/network/socket/qtcpserver/crashingServer/main.cpp @@ -53,7 +53,7 @@ int main(int argc, char *argv[]) return 1; } -#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WINCE) QFile file(QLatin1String("/test_signal.txt")); file.open(QIODevice::WriteOnly); file.write("Listening\n"); diff --git a/tests/auto/network/socket/qtcpserver/test/test.pro b/tests/auto/network/socket/qtcpserver/test/test.pro index 63e2d0a981..7cac14e645 100644 --- a/tests/auto/network/socket/qtcpserver/test/test.pro +++ b/tests/auto/network/socket/qtcpserver/test/test.pro @@ -12,13 +12,6 @@ wince*: { } } -symbian { - crashApp.files = $$QT_BUILD_TREE/examples/widgets/wiggly/$${BUILD_DIR}/crashingServer.exe - crashApp.path = . - DEPLOYMENT += crashApp - TARGET.CAPABILITY += NetworkServices ReadUserData -} - TARGET = ../tst_qtcpserver win32 { diff --git a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp index ca28a9c7c8..c070be9e64 100644 --- a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp +++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp @@ -39,9 +39,8 @@ ** ****************************************************************************/ -// Just to get Q_OS_SYMBIAN #include -#if defined(_WIN32) && !defined(Q_OS_SYMBIAN) +#if defined(_WIN32) #include #else #include @@ -137,7 +136,6 @@ void tst_QTcpServer::getSetCheck() tst_QTcpServer::tst_QTcpServer() { - Q_SET_DEFAULT_IAP } tst_QTcpServer::~tst_QTcpServer() @@ -454,7 +452,7 @@ void tst_QTcpServer::waitForConnectionTest() ThreadConnector connector(findLocalIpSocket.localAddress(), server.serverPort()); connector.start(); -#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WINCE) QVERIFY(server.waitForNewConnection(9000, &timeout)); #else QVERIFY(server.waitForNewConnection(3000, &timeout)); @@ -466,12 +464,8 @@ void tst_QTcpServer::waitForConnectionTest() void tst_QTcpServer::setSocketDescriptor() { QTcpServer server; -#ifdef Q_OS_SYMBIAN - QTest::ignoreMessage(QtWarningMsg, "QSymbianSocketEngine::initialize - socket descriptor not found"); -#endif QVERIFY(!server.setSocketDescriptor(42)); QCOMPARE(server.serverError(), QAbstractSocket::UnsupportedSocketOperationError); -#ifndef Q_OS_SYMBIAN //adopting Open C sockets is not supported, neither is adopting externally created RSocket #ifdef Q_OS_WIN // ensure winsock is started @@ -495,7 +489,6 @@ void tst_QTcpServer::setSocketDescriptor() #ifdef Q_OS_WIN WSACleanup(); #endif -#endif } //---------------------------------------------------------------------------------- @@ -522,11 +515,7 @@ protected: { // how a user woulddo it (qabstractsocketengine is not public) unsigned long arg = 0; -#if defined(Q_OS_SYMBIAN) - arg = fcntl(socketDescriptor, F_GETFL, NULL); - arg &= (~O_NONBLOCK); - ok = ::fcntl(socketDescriptor, F_SETFL, arg) != -1; -#elif defined(Q_OS_WIN) +#if defined(Q_OS_WIN) ok = ::ioctlsocket(socketDescriptor, FIONBIO, &arg) == 0; ::closesocket(socketDescriptor); #else @@ -538,10 +527,6 @@ protected: void tst_QTcpServer::addressReusable() { -#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86) - QSKIP("Symbian: Emulator does not support process launching", SkipAll ); -#endif - #if defined(QT_NO_PROCESS) QSKIP("Qt was compiled with QT_NO_PROCESS", SkipAll); #else @@ -553,7 +538,7 @@ void tst_QTcpServer::addressReusable() QSKIP("With socks5 this test does not make senans at the momment", SkipAll); } } -#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WINCE) QString signalName = QString::fromLatin1("/test_signal.txt"); QFile::remove(signalName); // The crashingServer process will crash once it gets a connection. @@ -587,9 +572,6 @@ void tst_QTcpServer::addressReusable() void tst_QTcpServer::setNewSocketDescriptorBlocking() { -#ifdef Q_OS_SYMBIAN - QSKIP("open C ioctls on Qt sockets not supported", SkipAll); -#else QFETCH_GLOBAL(bool, setProxy); if (setProxy) { QFETCH_GLOBAL(int, proxyType); @@ -604,7 +586,6 @@ void tst_QTcpServer::setNewSocketDescriptorBlocking() socket.connectToHost(QHostAddress::LocalHost, server.serverPort()); QVERIFY(server.waitForNewConnection(5000)); QVERIFY(server.ok); -#endif } void tst_QTcpServer::invalidProxy_data() diff --git a/tests/auto/network/socket/qtcpsocket/qtcpsocket.pro b/tests/auto/network/socket/qtcpsocket/qtcpsocket.pro index 5dfff5bb88..aa7ac6bbb7 100644 --- a/tests/auto/network/socket/qtcpsocket/qtcpsocket.pro +++ b/tests/auto/network/socket/qtcpsocket/qtcpsocket.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs !wince*: SUBDIRS = test stressTest -wince*|symbian|vxworks* : SUBDIRS = test +wince*|vxworks* : SUBDIRS = test requires(contains(QT_CONFIG,private_tests)) diff --git a/tests/auto/network/socket/qtcpsocket/stressTest/stressTest.pro b/tests/auto/network/socket/qtcpsocket/stressTest/stressTest.pro index f6215f80a0..c7a4308b17 100644 --- a/tests/auto/network/socket/qtcpsocket/stressTest/stressTest.pro +++ b/tests/auto/network/socket/qtcpsocket/stressTest/stressTest.pro @@ -7,6 +7,3 @@ CONFIG += console DESTDIR = ./ MOC_DIR = .moc/ TMP_DIR = .tmp/ - -symbian: TARGET.CAPABILITY = NetworkServices - diff --git a/tests/auto/network/socket/qtcpsocket/test/test.pro b/tests/auto/network/socket/qtcpsocket/test/test.pro index 61bfaad1a1..41ef18a4d8 100644 --- a/tests/auto/network/socket/qtcpsocket/test/test.pro +++ b/tests/auto/network/socket/qtcpsocket/test/test.pro @@ -13,11 +13,6 @@ wince*: { QT += network vxworks:QT -= gui -symbian: { - TARGET.EPOCHEAPSIZE="0x100 0x3000000" - TARGET.CAPABILITY = NetworkServices ReadUserData -} - TARGET = tst_qtcpsocket win32 { diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp index bae3f7c2f5..fb22cb5940 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp @@ -39,11 +39,9 @@ ** ****************************************************************************/ - -// Just to get Q_OS_SYMBIAN #include -#if defined(_WIN32) && !defined(Q_OS_SYMBIAN) +#if defined(_WIN32) #include #else #include @@ -478,9 +476,6 @@ void tst_QTcpSocket::setInvalidSocketDescriptor() { QTcpSocket *socket = newSocket(); QCOMPARE(socket->socketDescriptor(), -1); -#ifdef Q_OS_SYMBIAN - QTest::ignoreMessage(QtWarningMsg, "QSymbianSocketEngine::initialize - socket descriptor not found"); -#endif QVERIFY(!socket->setSocketDescriptor(-5, QTcpSocket::UnconnectedState)); QCOMPARE(socket->socketDescriptor(), -1); @@ -493,9 +488,6 @@ void tst_QTcpSocket::setInvalidSocketDescriptor() void tst_QTcpSocket::setSocketDescriptor() { -#ifdef Q_OS_SYMBIAN - QSKIP("adopting open c socket handles is not supported", SkipAll); -#else QFETCH_GLOBAL(bool, setProxy); if (setProxy) return; // this test doesn't make sense with proxies @@ -536,7 +528,6 @@ void tst_QTcpSocket::setSocketDescriptor() #ifdef Q_OS_WIN delete dummy; #endif -#endif } //---------------------------------------------------------------------------------- @@ -1053,11 +1044,7 @@ void tst_QTcpSocket::disconnectWhileConnecting() } connect(socket, SIGNAL(disconnected()), SLOT(exitLoopSlot())); -#ifndef Q_OS_SYMBIAN enterLoop(10); -#else - enterLoop(30); -#endif QVERIFY2(!timeout(), "Network timeout"); QVERIFY(socket->state() == QAbstractSocket::UnconnectedState); if (!closeDirectly) { @@ -1117,11 +1104,7 @@ protected: { bool timedOut = false; while (!quit) { -#ifndef Q_OS_SYMBIAN if (server->waitForNewConnection(500, &timedOut)) -#else - if (server->waitForNewConnection(5000, &timedOut)) -#endif break; if (!timedOut) return; @@ -1129,11 +1112,7 @@ protected: QTcpSocket *socket = server->nextPendingConnection(); while (!quit) { -#ifndef Q_OS_SYMBIAN if (socket->waitForDisconnected(500)) -#else - if (socket->waitForDisconnected(5000)) -#endif break; if (socket->error() != QAbstractSocket::SocketTimeoutError) return; @@ -1182,11 +1161,7 @@ void tst_QTcpSocket::disconnectWhileConnectingNoEventLoop() socket->disconnectFromHost(); } -#ifndef Q_OS_SYMBIAN QVERIFY2(socket->waitForDisconnected(10000), "Network timeout"); -#else - QVERIFY2(socket->waitForDisconnected(30000), "Network timeout"); -#endif QVERIFY(socket->state() == QAbstractSocket::UnconnectedState); if (!closeDirectly) { QCOMPARE(int(socket->openMode()), int(QIODevice::ReadWrite)); @@ -1234,11 +1209,7 @@ void tst_QTcpSocket::disconnectWhileLookingUp() // let anything queued happen QEventLoop loop; -#ifndef Q_OS_SYMBIAN QTimer::singleShot(50, &loop, SLOT(quit())); -#else - QTimer::singleShot(5000, &loop, SLOT(quit())); -#endif loop.exec(); // recheck @@ -1511,19 +1482,11 @@ void tst_QTcpSocket::dontCloseOnTimeout() QTcpSocket *socket = newSocket(); socket->connectToHost(serverAddress, server.serverPort()); -#ifndef Q_OS_SYMBIAN QVERIFY(!socket->waitForReadyRead(100)); -#else - QVERIFY(!socket->waitForReadyRead(5000)); -#endif QCOMPARE(socket->error(), QTcpSocket::SocketTimeoutError); QVERIFY(socket->isOpen()); -#ifndef Q_OS_SYMBIAN QVERIFY(!socket->waitForDisconnected(100)); -#else - QVERIFY(!socket->waitForDisconnected(5000)); -#endif QCOMPARE(socket->error(), QTcpSocket::SocketTimeoutError); QVERIFY(socket->isOpen()); @@ -2200,9 +2163,6 @@ void tst_QTcpSocket::suddenRemoteDisconnect_data() void tst_QTcpSocket::suddenRemoteDisconnect() { -#if defined( Q_OS_SYMBIAN ) - QSKIP("Symbian: QProcess IO is not yet supported, fix when supported", SkipAll); -#else QFETCH(QString, client); QFETCH(QString, server); @@ -2249,7 +2209,6 @@ void tst_QTcpSocket::suddenRemoteDisconnect() // Check that both exited normally. QCOMPARE(clientProcess.readAll().constData(), "SUCCESS\n"); QCOMPARE(serverProcess.readAll().constData(), "SUCCESS\n"); -#endif } //---------------------------------------------------------------------------------- @@ -2485,12 +2444,10 @@ void tst_QTcpSocket::invalidProxy_data() QTest::newRow("no-such-host-http") << int(QNetworkProxy::HttpProxy) << "this-host-will-never-exist.troll.no" << 3128 << false << int(QAbstractSocket::ProxyNotFoundError); -#if !defined(Q_OS_SYMBIAN) QTest::newRow("http-on-socks5") << int(QNetworkProxy::HttpProxy) << fluke << 1080 << false << int(QAbstractSocket::ProxyConnectionClosedError); QTest::newRow("socks5-on-http") << int(QNetworkProxy::Socks5Proxy) << fluke << 3128 << false << int(QAbstractSocket::SocketTimeoutError); -#endif } void tst_QTcpSocket::invalidProxy() diff --git a/tests/auto/network/socket/qudpsocket/clientserver/clientserver.pro b/tests/auto/network/socket/qudpsocket/clientserver/clientserver.pro index 6da148659c..a1b0021232 100644 --- a/tests/auto/network/socket/qudpsocket/clientserver/clientserver.pro +++ b/tests/auto/network/socket/qudpsocket/clientserver/clientserver.pro @@ -4,5 +4,3 @@ CONFIG += console CONFIG -= app_bundle TARGET = clientserver DESTDIR = ./ - -symbian: TARGET.CAPABILITY += NetworkServices diff --git a/tests/auto/network/socket/qudpsocket/test/test.pro b/tests/auto/network/socket/qudpsocket/test/test.pro index 508dc97053..2bc074d9f6 100644 --- a/tests/auto/network/socket/qudpsocket/test/test.pro +++ b/tests/auto/network/socket/qudpsocket/test/test.pro @@ -14,7 +14,7 @@ win32 { DESTDIR = ../ } -wince*|symbian: { +wince* { addApp.files = ../clientserver/clientserver.exe addApp.path = clientserver DEPLOYMENT += addApp @@ -22,7 +22,4 @@ wince*|symbian: { TARGET = tst_qudpsocket -symbian: TARGET.CAPABILITY += NetworkServices - - CONFIG+=insignificant_test diff --git a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp index 83d30cc40a..47d1908d7d 100644 --- a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp +++ b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp @@ -132,7 +132,6 @@ private: tst_QUdpSocket::tst_QUdpSocket() { - Q_SET_DEFAULT_IAP } tst_QUdpSocket::~tst_QUdpSocket() @@ -609,13 +608,6 @@ void tst_QUdpSocket::writeDatagram() qint64(i * 1024)); QCOMPARE(errorspy.count(), 0); if (!server.waitForReadyRead(5000)) { -#ifdef Q_OS_SYMBIAN - //symbian receive buffer for datagrams is ~30k, but it can send datagrams up to the maximum 64k... - if (i > 28) { - i = 64; - continue; - } -#endif QSKIP(QString("UDP packet lost at size %1, unable to complete the test.").arg(i * 1024).toLatin1().data(), SkipSingle); } QCOMPARE(server.pendingDatagramSize(), qint64(i * 1024)); @@ -625,21 +617,7 @@ void tst_QUdpSocket::writeDatagram() void tst_QUdpSocket::performance() { -#if defined(Q_OS_SYMBIAN) - // Large packets seems not to go through on Symbian - // Reason might be also fragmentation due to VPN connection etc - - QFETCH_GLOBAL(bool, setProxy); - QFETCH_GLOBAL(int, proxyType); - - int arrSize = 8192; - if (setProxy && proxyType == QNetworkProxy::Socks5Proxy) - arrSize = 1024; - - QByteArray arr(arrSize, '@'); -#else QByteArray arr(8192, '@'); -#endif // Q_OS_SYMBIAN QUdpSocket server; #ifdef FORCE_SESSION @@ -675,14 +653,6 @@ void tst_QUdpSocket::performance() float secs = stopWatch.elapsed() / 1000.0; qDebug("\t%.2fMB/%.2fs: %.2fMB/s", float(nbytes / (1024.0*1024.0)), secs, float(nbytes / (1024.0*1024.0)) / secs); - -#if defined(Q_OS_SYMBIAN) - if(nbytes == 0) { - qDebug("No bytes passed through local UDP socket, since UDP socket write returns EWOULDBLOCK"); - qDebug("Should try with blocking sockets, but it is not currently possible due to Open C defect"); - } -#endif - } void tst_QUdpSocket::bindMode() @@ -705,47 +675,7 @@ void tst_QUdpSocket::bindMode() socket2.setProperty("_q_networksession", QVariant::fromValue(networkSession)); #endif QVERIFY(!socket2.bind(socket.localPort())); -#if defined(Q_OS_SYMBIAN) - if(RProcess().HasCapability(ECapabilityNetworkControl)) { - qDebug("Test executed *with* NetworkControl capability"); - // In Symbian OS ReuseAddressHint together with NetworkControl capability - // gives application *always* right to bind to port. I.e. it does not matter - // if first socket was bound with any bind flag. Since autotests in Symbian - // are currently executed with ALL -TCB rights, this path is the one executed. - QVERIFY(socket2.bind(socket.localPort(), QUdpSocket::ReuseAddressHint)); - socket.close(); - socket2.close(); - - QVERIFY2(socket.bind(0, QUdpSocket::ShareAddress), socket.errorString().toLatin1().constData()); - QVERIFY(!socket2.bind(socket.localPort())); - QVERIFY2(socket2.bind(socket.localPort(), QUdpSocket::ReuseAddressHint), socket2.errorString().toLatin1().constData()); - socket.close(); - socket2.close(); - - QVERIFY2(socket.bind(0, QUdpSocket::DontShareAddress), socket.errorString().toLatin1().constData()); - QVERIFY(!socket2.bind(socket.localPort())); - QVERIFY(socket2.bind(socket.localPort(), QUdpSocket::ReuseAddressHint)); - socket.close(); - socket2.close(); - } else { - qDebug("Test executed *without* NetworkControl capability"); - // If we don't have NetworkControl capability, attempt to bind already bound - // address will *always* fail. I.e. it does not matter if first socket was - // bound with any bind flag. - QVERIFY(!socket2.bind(socket.localPort(), QUdpSocket::ReuseAddressHint)); - socket.close(); - - QVERIFY2(socket.bind(0, QUdpSocket::ShareAddress), socket.errorString().toLatin1().constData()); - QVERIFY(!socket2.bind(socket.localPort())); - QVERIFY2(!socket2.bind(socket.localPort(), QUdpSocket::ReuseAddressHint), socket2.errorString().toLatin1().constData()); - socket.close(); - - QVERIFY2(socket.bind(0, QUdpSocket::DontShareAddress), socket.errorString().toLatin1().constData()); - QVERIFY(!socket2.bind(socket.localPort())); - QVERIFY(!socket2.bind(socket.localPort(), QUdpSocket::ReuseAddressHint)); - socket.close(); - } -#elif defined(Q_OS_UNIX) +#if defined(Q_OS_UNIX) QVERIFY(!socket2.bind(socket.localPort(), QUdpSocket::ReuseAddressHint)); socket.close(); QVERIFY2(socket.bind(0, QUdpSocket::ShareAddress), socket.errorString().toLatin1().constData()); @@ -862,8 +792,8 @@ void tst_QUdpSocket::writeToNonExistingPeer() void tst_QUdpSocket::outOfProcessConnectedClientServerTest() { -#if defined(Q_OS_WINCE) || defined (Q_OS_SYMBIAN) - QSKIP("This test depends on reading data from QProcess (not supported on Qt/WinCE and Symbian).", SkipAll); +#if defined(Q_OS_WINCE) + QSKIP("This test depends on reading data from QProcess (not supported on Qt/WinCE).", SkipAll); #endif #if defined(QT_NO_PROCESS) QSKIP("Qt was compiled with QT_NO_PROCESS", SkipAll); @@ -927,8 +857,8 @@ void tst_QUdpSocket::outOfProcessConnectedClientServerTest() void tst_QUdpSocket::outOfProcessUnconnectedClientServerTest() { -#if defined(Q_OS_WINCE) || defined (Q_OS_SYMBIAN) - QSKIP("This test depends on reading data from QProcess (not supported on Qt/WinCE and Symbian).", SkipAll); +#if defined(Q_OS_WINCE) + QSKIP("This test depends on reading data from QProcess (not supported on Qt/WinCE).", SkipAll); #endif #if defined(QT_NO_PROCESS) QSKIP("Qt was compiled with QT_NO_PROCESS", SkipAll); @@ -1143,13 +1073,8 @@ void tst_QUdpSocket::multicastLeaveAfterClose() #ifdef FORCE_SESSION udpSocket.setProperty("_q_networksession", QVariant::fromValue(networkSession)); #endif -#ifdef Q_OS_SYMBIAN - QVERIFY2(udpSocket.bind(), - qPrintable(udpSocket.errorString())); -#else QVERIFY2(udpSocket.bind(groupAddress, 0), qPrintable(udpSocket.errorString())); -#endif QVERIFY2(udpSocket.joinMulticastGroup(groupAddress), qPrintable(udpSocket.errorString())); udpSocket.close(); @@ -1173,9 +1098,6 @@ void tst_QUdpSocket::setMulticastInterface_data() void tst_QUdpSocket::setMulticastInterface() { -#ifdef Q_OS_SYMBIAN - QSKIP("Symbian has no IPV6_MULTICAST_IF equivalent", SkipAll); -#else QFETCH_GLOBAL(bool, setProxy); QFETCH(QNetworkInterface, iface); QFETCH(QHostAddress, address); @@ -1198,7 +1120,6 @@ void tst_QUdpSocket::setMulticastInterface() } else { QVERIFY(!iface2.isValid()); } -#endif } void tst_QUdpSocket::multicast_data() @@ -1247,12 +1168,6 @@ void tst_QUdpSocket::multicast() #endif // bind first, then verify that we can join the multicast group -#ifdef Q_OS_SYMBIAN - if (!setProxy) { - QEXPECT_FAIL("same bind, group ipv4 address", "bind to group address not supported on symbian", Abort); - QEXPECT_FAIL("same bind, group ipv6 address", "bind to group address not supported on symbian", Abort); - } -#endif QVERIFY2(receiver.bind(bindAddress, 0) == bindResult, qPrintable(receiver.errorString())); if (!bindResult) @@ -1289,9 +1204,6 @@ void tst_QUdpSocket::multicast() receiver.readDatagram(datagram.data(), datagram.size(), 0, 0); receivedDatagrams << datagram; } -#ifdef Q_OS_SYMBIAN - QEXPECT_FAIL("valid bind, group ipv4 address", "IPv4 multicast not supported on symbian", Abort); -#endif QCOMPARE(receivedDatagrams, datagrams); QVERIFY2(receiver.leaveMulticastGroup(groupAddress), qPrintable(receiver.errorString())); diff --git a/tests/auto/network/socket/qudpsocket/udpServer/udpServer.pro b/tests/auto/network/socket/qudpsocket/udpServer/udpServer.pro index 7438d40fb0..cf707aa14a 100644 --- a/tests/auto/network/socket/qudpsocket/udpServer/udpServer.pro +++ b/tests/auto/network/socket/qudpsocket/udpServer/udpServer.pro @@ -3,5 +3,3 @@ QT = core network CONFIG -= app_bundle CONFIG += console -symbian:TARGET.CAPABILITY="ALL -TCB" - -- cgit v1.2.3