diff options
Diffstat (limited to 'tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp')
| -rw-r--r-- | tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp b/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp index 848f813d1e..1348e6d6c7 100644 --- a/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp +++ b/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp @@ -76,10 +76,6 @@ QT_END_NAMESPACE //TESTED_CLASS= //TESTED_FILES= -#ifdef Q_OS_SYMBIAN -#define SRCDIR "" -#endif - class tst_QTextStream : public QObject { Q_OBJECT @@ -378,7 +374,6 @@ void tst_QTextStream::getSetCheck() tst_QTextStream::tst_QTextStream() { - Q_SET_DEFAULT_IAP } tst_QTextStream::~tst_QTextStream() @@ -1126,13 +1121,7 @@ void tst_QTextStream::stillOpenWhenAtEnd() #endif QTcpSocket socket; socket.connectToHost(QtNetworkSettings::serverName(), 143); -#if defined(Q_OS_SYMBIAN) - // This number is determined in an arbitrary way; whatever it takes - // to make the test pass. - QVERIFY(socket.waitForReadyRead(30000)); -#else QVERIFY(socket.waitForReadyRead(5000)); -#endif QTextStream stream2(&socket); while (!stream2.readLine().isNull()) {} @@ -1410,8 +1399,8 @@ void tst_QTextStream::pos3LargeFile() // ------------------------------------------------------------------------------ void tst_QTextStream::readStdin() { -#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) - QSKIP("Qt/CE and Symbian have no stdin/out support for processes", SkipAll); +#if defined(Q_OS_WINCE) + QSKIP("Qt/CE has no stdin/out support for processes", SkipAll); #endif QProcess stdinProcess; stdinProcess.start("stdinProcess/stdinProcess"); @@ -1436,8 +1425,8 @@ void tst_QTextStream::readStdin() // ------------------------------------------------------------------------------ void tst_QTextStream::readAllFromStdin() { -#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) - QSKIP("Qt/CE and Symbian have no stdin/out support for processes", SkipAll); +#if defined(Q_OS_WINCE) + QSKIP("Qt/CE has no stdin/out support for processes", SkipAll); #endif QProcess stdinProcess; stdinProcess.start("readAllStdinProcess/readAllStdinProcess", QIODevice::ReadWrite | QIODevice::Text); @@ -1457,8 +1446,8 @@ void tst_QTextStream::readAllFromStdin() // ------------------------------------------------------------------------------ void tst_QTextStream::readLineFromStdin() { -#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) - QSKIP("Qt/CE and Symbian have no stdin/out support for processes", SkipAll); +#if defined(Q_OS_WINCE) + QSKIP("Qt/CE has no stdin/out support for processes", SkipAll); #endif QProcess stdinProcess; stdinProcess.start("readLineStdinProcess/readLineStdinProcess", QIODevice::ReadWrite | QIODevice::Text); @@ -2899,7 +2888,7 @@ void tst_QTextStream::int_write_with_locale() // ------------------------------------------------------------------------------ // like QTEST_APPLESS_MAIN, but initialising the locale on Unix -#if defined (Q_OS_UNIX) && !defined (Q_OS_SYMBIAN) +#if defined (Q_OS_UNIX) QT_BEGIN_NAMESPACE extern bool qt_locale_initialized; QT_END_NAMESPACE @@ -2907,7 +2896,7 @@ QT_END_NAMESPACE int main(int argc, char *argv[]) { -#if defined (Q_OS_UNIX) && !defined (Q_OS_SYMBIAN) +#if defined (Q_OS_UNIX) ::setlocale(LC_ALL, ""); qt_locale_initialized = true; #endif |