tst_qhostinfo: Fix IPv6 lookup detection on Windows.
Moved the QTcpServer test to init winsock before we use getaddrinfo. Reviewed-by: Shane Kearns (cherry picked from commit 0ccf01368adcabbb25958a55976083f72116a2d5)
This commit is contained in:
parent
0ebe0414d2
commit
df2d6753ac
@ -213,6 +213,13 @@ void tst_QHostInfo::initTestCase()
|
||||
#else
|
||||
ipv6Available = false;
|
||||
ipv6LookupsAvailable = false;
|
||||
|
||||
QTcpServer server;
|
||||
if (server.listen(QHostAddress("::1"))) {
|
||||
// We have IPv6 support
|
||||
ipv6Available = true;
|
||||
}
|
||||
|
||||
#if !defined(QT_NO_GETADDRINFO)
|
||||
// check if the system getaddrinfo can do IPv6 lookups
|
||||
struct addrinfo hint, *result = 0;
|
||||
@ -235,13 +242,6 @@ void tst_QHostInfo::initTestCase()
|
||||
#endif
|
||||
#endif
|
||||
|
||||
QTcpServer server;
|
||||
if (server.listen(QHostAddress("::1"))) {
|
||||
// We have IPv6 support
|
||||
ipv6Available = true;
|
||||
}
|
||||
|
||||
|
||||
// run each testcase with and without test enabled
|
||||
QTest::addColumn<bool>("cache");
|
||||
QTest::newRow("WithCache") << true;
|
||||
|
Loading…
Reference in New Issue
Block a user