summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/socket/qsocks5socketengine
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/network/socket/qsocks5socketengine')
-rw-r--r--tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro5
-rw-r--r--tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp7
2 files changed, 1 insertions, 11 deletions
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);