diff options
| author | Jonathan Liu <net147@gmail.com> | 2012-11-21 21:37:03 +1100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-22 11:39:04 +0100 |
| commit | e010dcf12c8117bb554acb0c765b9dc68198c01d (patch) | |
| tree | 9c6fece8a304143a005cc02cd11074bb5bb0ac3e /tests/auto/network/kernel/qhostinfo | |
| parent | 78a239bc6d344f53cf48e4bceca7d45df69220e6 (diff) | |
Add support for getaddrinfo using MinGW in tst_qhostinfo
Change-Id: Ief9ddd22171ec2b852ca504957e0e11b90badccb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/network/kernel/qhostinfo')
| -rw-r--r-- | tests/auto/network/kernel/qhostinfo/qhostinfo.pro | 3 | ||||
| -rw-r--r-- | tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp | 10 |
2 files changed, 5 insertions, 8 deletions
diff --git a/tests/auto/network/kernel/qhostinfo/qhostinfo.pro b/tests/auto/network/kernel/qhostinfo/qhostinfo.pro index 3b9ecbab50..c21e73ccee 100644 --- a/tests/auto/network/kernel/qhostinfo/qhostinfo.pro +++ b/tests/auto/network/kernel/qhostinfo/qhostinfo.pro @@ -11,5 +11,8 @@ wince*: { win32:LIBS += -lws2_32 } +# needed for getaddrinfo with official MinGW +win32-g++*:DEFINES += _WIN32_WINNT=0x0501 + linux-*:CONFIG+=insignificant_test # QTBUG-23837 - test is unstable DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp index f4c585c594..0f27c889fd 100644 --- a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp +++ b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp @@ -44,16 +44,10 @@ // (except qglobal.h), or else you'll get tons of compile errors #include <qglobal.h> -// MinGW doesn't provide getaddrinfo(), so we test for Q_OS_WIN -// and Q_CC_GNU, which indirectly tells us whether we're using MinGW. -#if defined(Q_OS_WIN) && defined(Q_CC_GNU) -# define QT_NO_GETADDRINFO -#endif - // To prevent windows system header files from re-defining min/max #define NOMINMAX 1 -#if defined(Q_OS_WIN) && !defined(QT_NO_GETADDRINFO) +#if defined(Q_OS_WIN) # include <winsock2.h> # include <ws2tcpip.h> #endif @@ -216,7 +210,7 @@ void tst_QHostInfo::initTestCase() } // HP-UX 11i does not support IPv6 reverse lookups. -#if !defined(QT_NO_GETADDRINFO) || !(defined(Q_OS_HPUX) && defined(__ia64)) +#if !defined(QT_NO_GETADDRINFO) && !(defined(Q_OS_HPUX) && defined(__ia64)) // check if the system getaddrinfo can do IPv6 lookups struct addrinfo hint, *result = 0; memset(&hint, 0, sizeof hint); |