summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@accenture.com>2011-03-11 19:40:32 (GMT)
committerShane Kearns <shane.kearns@accenture.com>2011-03-15 09:54:37 (GMT)
commitcec4faf5b0eb2d5f55c4651c1a8e6137808c21c7 (patch)
treeef422d0da845fe096373e480a8d8b2dfa25f9fab
parentb24711c377d5d0eab17d729d3d1291771410b846 (diff)
downloadQt-cec4faf5b0eb2d5f55c4651c1a8e6137808c21c7.zip
Qt-cec4faf5b0eb2d5f55c4651c1a8e6137808c21c7.tar.gz
Qt-cec4faf5b0eb2d5f55c4651c1a8e6137808c21c7.tar.bz2
Fix for server.listen getting IPv6 address
Reviewed-by: Markus Goetz
-rw-r--r--tests/auto/qtcpsocket/tst_qtcpsocket.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
index b972130..6852e29 100644
--- a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
@@ -1432,7 +1432,7 @@ void tst_QTcpSocket::dontCloseOnTimeout()
QVERIFY(server.listen());
QHostAddress serverAddress = QHostAddress::LocalHost;
- if (!(server.serverAddress() == QHostAddress::Any))
+ if (!(server.serverAddress() == QHostAddress::Any) && !(server.serverAddress() == QHostAddress::AnyIPv6))
serverAddress = server.serverAddress();
QTcpSocket *socket = newSocket();