From c5ea7fd39a737ee16e82a6ef49a3149758b96e2b Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed, 31 Aug 2011 13:24:37 +0200
Subject: Fix autotests to build on Windows.

Basically breakage by <windows.h> being included from the OpenGL
parts of <QtGui/QtGui> included from <QtTest/QtTest>.

Change-Id: Id285fb89c64bf77e2408faac5688acd085579351
Reviewed-on: http://codereview.qt.nokia.com/3952
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---
 tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'tests/auto/qsocketnotifier')

diff --git a/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp b/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp
index 77836b4671..2c3a6c52bf 100644
--- a/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp
+++ b/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp
@@ -40,9 +40,12 @@
 ****************************************************************************/
 
 
-#include <QtTest/QtTest>
+#include <QtTest/QTest>
+#include <QtTest/QSignalSpy>
+#include <QtTest/QTestEventLoop>
 
 #include <QtCore/QCoreApplication>
+#include <QtCore/QTimer>
 #include <QtCore/QSocketNotifier>
 #include <QtNetwork/QTcpServer>
 #include <QtNetwork/QTcpSocket>
@@ -55,9 +58,14 @@
 #endif
 #ifdef Q_OS_UNIX
 #include <private/qnet_unix_p.h>
+#include <sys/select.h>
 #endif
 #include <limits>
-#include <sys/select.h>
+
+#if defined (Q_CC_MSVC) && defined(max)
+#  undef max
+#  undef min
+#endif // Q_CC_MSVC
 
 class tst_QSocketNotifier : public QObject
 {
-- 
cgit v1.2.3