diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-08-31 13:24:37 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-08-31 13:26:27 +0200 |
| commit | c5ea7fd39a737ee16e82a6ef49a3149758b96e2b (patch) | |
| tree | f14c1b1c25661bbd78f8ffb1de9a3c64a5319232 /tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp | |
| parent | 94355ca15a4d451f4a4b858240e2c1a96e26537b (diff) | |
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>
Diffstat (limited to 'tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp')
| -rw-r--r-- | tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
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 { |