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/corelib/concurrent/qfuture/tst_qfuture.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/corelib/concurrent/qfuture/tst_qfuture.cpp')
| -rw-r--r-- | tests/auto/corelib/concurrent/qfuture/tst_qfuture.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/corelib/concurrent/qfuture/tst_qfuture.cpp b/tests/auto/corelib/concurrent/qfuture/tst_qfuture.cpp index 2178489bd9..d81df0d863 100644 --- a/tests/auto/corelib/concurrent/qfuture/tst_qfuture.cpp +++ b/tests/auto/corelib/concurrent/qfuture/tst_qfuture.cpp @@ -55,6 +55,11 @@ using namespace QtConcurrent; +// COM interface macro. +#if defined(Q_OS_WIN) && defined(interface) +# undef interface +#endif + //TESTED_CLASS= //TESTED_FILES= |