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/qtcpsocket | |
| 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/qtcpsocket')
| -rw-r--r-- | tests/auto/qtcpsocket/test/test.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qtcpsocket/tst_qtcpsocket.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/qtcpsocket/test/test.pro b/tests/auto/qtcpsocket/test/test.pro index f4207d6..7bf5ba0 100644 --- a/tests/auto/qtcpsocket/test/test.pro +++ b/tests/auto/qtcpsocket/test/test.pro @@ -13,7 +13,7 @@ vxworks:QT -= gui symbian: { TARGET.EPOCHEAPSIZE="0x100 0x3000000" - TARGET.CAPABILITY = NetworkServices + TARGET.CAPABILITY = NetworkServices ReadUserData } TARGET = tst_qtcpsocket diff --git a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp index 623e02b..f83c4cf 100644 --- a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp @@ -476,6 +476,9 @@ void tst_QTcpSocket::setInvalidSocketDescriptor() { QTcpSocket *socket = newSocket(); QCOMPARE(socket->socketDescriptor(), -1); +#ifdef Q_OS_SYMBIAN + QTest::ignoreMessage(QtWarningMsg, "QSymbianSocketEngine::initialize - socket descriptor not found"); +#endif QVERIFY(!socket->setSocketDescriptor(-5, QTcpSocket::UnconnectedState)); QCOMPARE(socket->socketDescriptor(), -1); |