diff options
| author | mread <qt-info@nokia.com> | 2009-08-05 09:32:17 (GMT) |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2009-08-05 09:32:17 (GMT) |
| commit | 638edc80e3b224a6830dda0a2bd3097cb82dcb96 (patch) | |
| tree | bdbb6a19e69f1388abcd032c1795ac87b13ceec1 /tests/auto/qtextstream/tst_qtextstream.cpp | |
| parent | 867bcdcce78acca9fde2ffc57e6a304cd2e25517 (diff) | |
| parent | acd877fbff4a0c785143fcc891eae73f5b986ff9 (diff) | |
| download | Qt-638edc80e3b224a6830dda0a2bd3097cb82dcb96.zip Qt-638edc80e3b224a6830dda0a2bd3097cb82dcb96.tar.gz Qt-638edc80e3b224a6830dda0a2bd3097cb82dcb96.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'tests/auto/qtextstream/tst_qtextstream.cpp')
| -rw-r--r-- | tests/auto/qtextstream/tst_qtextstream.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qtextstream/tst_qtextstream.cpp b/tests/auto/qtextstream/tst_qtextstream.cpp index 484d7c9..d8dd618 100644 --- a/tests/auto/qtextstream/tst_qtextstream.cpp +++ b/tests/auto/qtextstream/tst_qtextstream.cpp @@ -476,7 +476,7 @@ tst_QTextStream::tst_QTextStream() } tst_QTextStream::~tst_QTextStream() -{ +{ } void tst_QTextStream::init() @@ -1251,7 +1251,7 @@ void tst_QTextStream::stillOpenWhenAtEnd() #endif QTcpSocket socket; socket.connectToHost(QtNetworkSettings::serverName(), 143); -#if defined(Q_OS_SYMBIAN) +#if defined(Q_OS_SYMBIAN) QVERIFY(socket.waitForReadyRead(30000)); #else QVERIFY(socket.waitForReadyRead(5000)); |