diff options
| author | João Abecasis <joao@abecasis.name> | 2010-12-05 00:28:48 (GMT) |
|---|---|---|
| committer | João Abecasis <joao@abecasis.name> | 2010-12-05 00:28:48 (GMT) |
| commit | e37ca76dc70269017eaa7a32c4fae97c9e153ca0 (patch) | |
| tree | 9c0b36e959c5d4833873e9e5d755aa41a6e1d1fc /src/corelib/io | |
| parent | e2498cf6e6c193df849f6dbbaab3a827ca3e3a23 (diff) | |
| download | Qt-e37ca76dc70269017eaa7a32c4fae97c9e153ca0.zip Qt-e37ca76dc70269017eaa7a32c4fae97c9e153ca0.tar.gz Qt-e37ca76dc70269017eaa7a32c4fae97c9e153ca0.tar.bz2 | |
New attempt at fixing compilation failure
Including windows.h and defining _WIN32_WINNT didn't cut it. Instead,
fall back to explicitly #defining IO_REPARSE_TAG_SYMLINK in metadata
header, since it's all that's needed there. In windows-specific iterator
implementation ensure _WIN32_WINNT >= 0x0500.
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qfilesystemiterator_win.cpp | 3 | ||||
| -rw-r--r-- | src/corelib/io/qfilesystemmetadata_p.h | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/corelib/io/qfilesystemiterator_win.cpp b/src/corelib/io/qfilesystemiterator_win.cpp index 96c7fdb..6608a9e 100644 --- a/src/corelib/io/qfilesystemiterator_win.cpp +++ b/src/corelib/io/qfilesystemiterator_win.cpp @@ -43,7 +43,8 @@ #include "qfilesystemengine_p.h" #include "qplatformdefs.h" -#ifndef _WIN32_WINNT +#if _WIN32_WINNT < 0x0500 +#undef _WIN32_WINNT #define _WIN32_WINNT 0x0500 #endif diff --git a/src/corelib/io/qfilesystemmetadata_p.h b/src/corelib/io/qfilesystemmetadata_p.h index 5b5587b..c4e11d9 100644 --- a/src/corelib/io/qfilesystemmetadata_p.h +++ b/src/corelib/io/qfilesystemmetadata_p.h @@ -60,15 +60,12 @@ // Platform-specific includes #if defined(Q_OS_WIN) -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0500 +#ifndef IO_REPARSE_TAG_SYMLINK +#define IO_REPARSE_TAG_SYMLINK (0xA000000CL) #endif - -#include <QtCore/qt_windows.h> #elif defined(Q_OS_SYMBIAN) #include <f32file.h> #include <QtCore/private/qdatetime_p.h> -#else #endif QT_BEGIN_NAMESPACE |