diff options
| author | Zeno Albisser <zeno.albisser@nokia.com> | 2010-04-27 08:19:04 (GMT) |
|---|---|---|
| committer | Zeno Albisser <zeno.albisser@nokia.com> | 2010-04-27 09:26:19 (GMT) |
| commit | 0bb78b7a6e6c8d539cc4c69e4703c62cbe176bc6 (patch) | |
| tree | c375679c7f36d607e8bde406ce1a41fa945a4a82 | |
| parent | 2d1199ea9dafe31221f928a9e866893db180d1bf (diff) | |
| download | Qt-0bb78b7a6e6c8d539cc4c69e4703c62cbe176bc6.zip Qt-0bb78b7a6e6c8d539cc4c69e4703c62cbe176bc6.tar.gz Qt-0bb78b7a6e6c8d539cc4c69e4703c62cbe176bc6.tar.bz2 | |
Repositioned _WIN32_WINNT define in tst_qfileinfo and tst_qdir
This define is needed to make sure that some structures used for
creating junctions and symlinks get properly defined in winioctl.h.
Reviewed-by: TrustMe
| -rw-r--r-- | tests/auto/qdir/tst_qdir.cpp | 5 | ||||
| -rw-r--r-- | tests/auto/qfileinfo/tst_qfileinfo.cpp | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/tests/auto/qdir/tst_qdir.cpp b/tests/auto/qdir/tst_qdir.cpp index c8c835f..71469bb 100644 --- a/tests/auto/qdir/tst_qdir.cpp +++ b/tests/auto/qdir/tst_qdir.cpp @@ -49,6 +49,11 @@ #include <qregexp.h> #include <qstringlist.h> #include "../network-settings.h" + +#if defined(Q_OS_WIN) +#define _WIN32_WINNT 0x500 +#endif + #include "../../shared/filesystem.h" #if defined(Q_OS_SYMBIAN) diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp index 5612999..ca8c1c9 100644 --- a/tests/auto/qfileinfo/tst_qfileinfo.cpp +++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp @@ -39,9 +39,6 @@ ** ****************************************************************************/ -#ifdef Q_OS_WIN -#define _WIN32_WINNT 0x500 -#endif #include <QtTest/QtTest> @@ -58,6 +55,7 @@ #include <sys/stat.h> #endif #ifdef Q_OS_WIN +#define _WIN32_WINNT 0x500 #include <qt_windows.h> #include <qlibrary.h> #endif |