diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-11 11:17:22 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-11 11:17:22 (GMT) |
| commit | 97447d569999372d43f22dbb1e0fc5193b73615c (patch) | |
| tree | 5b1fb557d6356e4eebe5045009eaa0c4c2138dea /tests/auto/qtcpserver/tst_qtcpserver.cpp | |
| parent | eabcaaa9be03674d45e6bb53e098d5b5b3e9ef81 (diff) | |
| parent | 1a742a039802b32cfe2a92d8ef1a04c3a21a964f (diff) | |
| download | Qt-97447d569999372d43f22dbb1e0fc5193b73615c.zip Qt-97447d569999372d43f22dbb1e0fc5193b73615c.tar.gz Qt-97447d569999372d43f22dbb1e0fc5193b73615c.tar.bz2 | |
Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7
Conflicts:
src/network/access/qhttpnetworkconnectionchannel.cpp
src/network/socket/qabstractsocket.cpp
tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
Diffstat (limited to 'tests/auto/qtcpserver/tst_qtcpserver.cpp')
| -rw-r--r-- | tests/auto/qtcpserver/tst_qtcpserver.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/qtcpserver/tst_qtcpserver.cpp b/tests/auto/qtcpserver/tst_qtcpserver.cpp index 9cddc00..2cd870f 100644 --- a/tests/auto/qtcpserver/tst_qtcpserver.cpp +++ b/tests/auto/qtcpserver/tst_qtcpserver.cpp @@ -430,6 +430,9 @@ void tst_QTcpServer::waitForConnectionTest() void tst_QTcpServer::setSocketDescriptor() { QTcpServer server; +#ifdef Q_OS_SYMBIAN + QTest::ignoreMessage(QtWarningMsg, "QSymbianSocketEngine::initialize - socket descriptor not found"); +#endif QVERIFY(!server.setSocketDescriptor(42)); QCOMPARE(server.serverError(), QAbstractSocket::UnsupportedSocketOperationError); #ifndef Q_OS_SYMBIAN |