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 --- .../network/socket/qsocks5socketengine/qsocks5socketengine.pro | 5 ----- .../network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp | 7 +------ 2 files changed, 1 insertion(+), 11 deletions(-) (limited to 'tests/auto/network/socket/qsocks5socketengine') 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); -- cgit v1.2.3