summaryrefslogtreecommitdiffstats
path: root/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-05-17 13:43:30 +1000
committerJason McDonald <jason.mcdonald@nokia.com>2011-05-18 16:09:29 +1000
commit49babe02f0a00fe2baff3950fbdcb725ce20d772 (patch)
treee0383c879f78ef74ba7a0fe394504c096312edf4 /tests/auto/qtcpsocket/tst_qtcpsocket.cpp
parent0cd93933d8e5cc69151958fc285936854ff86e47 (diff)
Remove autotest code for Qt3Support library.
This commit deals with the simple cases -- mostly just removing blocks of code enclosed in #ifdef QT3_SUPPORT. Later commits will deal with the trickier cases. Change-Id: I280dea25b3754be175efe62fc7e5e4e7c304e658 Task-number: QTBUG-19325 Reviewed-by: Rohan McGovern
Diffstat (limited to 'tests/auto/qtcpsocket/tst_qtcpsocket.cpp')
-rw-r--r--tests/auto/qtcpsocket/tst_qtcpsocket.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
index f83c4cf99c..2e664935be 100644
--- a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
@@ -2167,20 +2167,12 @@ void tst_QTcpSocket::suddenRemoteDisconnect_data()
QTest::addColumn<QString>("client");
QTest::addColumn<QString>("server");
-#ifdef QT3_SUPPORT
- QTest::newRow("Qt3 Client <-> Qt3 Server") << QString::fromLatin1("qt3client") << QString::fromLatin1("qt3server");
- QTest::newRow("Qt3 Client <-> Qt4 Server") << QString::fromLatin1("qt3client") << QString::fromLatin1("qt4server");
- QTest::newRow("Qt4 Client <-> Qt3 Server") << QString::fromLatin1("qt4client") << QString::fromLatin1("qt3server");
-#endif
-
QTest::newRow("Qt4 Client <-> Qt4 Server") << QString::fromLatin1("qt4client") << QString::fromLatin1("qt4server");
}
void tst_QTcpSocket::suddenRemoteDisconnect()
{
-#if defined(Q_OS_WINCE) || defined(Q_OS_VXWORKS)
- QSKIP("stressTest subprocess needs Qt3Support", SkipAll);
-#elif defined( Q_OS_SYMBIAN )
+#if defined( Q_OS_SYMBIAN )
QSKIP("Symbian: QProcess IO is not yet supported, fix when supported", SkipAll);
#else
QFETCH(QString, client);