From f052ee467d257eb289b560c1420c59e6c558ba91 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 17 Sep 2012 12:32:09 +0200 Subject: Fix MinGW/gcc warning about NOMINMAX being redefined Commit 5230d62fe added a #define NOMINMAX, which conflicts with a NOMINMAX definition in the MinGW headers. Just use the same definition as in MinGW to fix the gcc warning. Change-Id: Ib21dd323ebbdca5d143e394c7631303e0c72541a Reviewed-by: Thiago Macieira --- tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/auto/network/kernel/qhostinfo') diff --git a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp index e86b0b7cde..973cf1fe5a 100644 --- a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp +++ b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp @@ -51,7 +51,7 @@ #endif // To prevent windows system header files from re-defining min/max -#define NOMINMAX +#define NOMINMAX 1 #if defined(Q_OS_WIN) && !defined(QT_NO_GETADDRINFO) # include -- cgit v1.2.3