mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 16:10:24 +08:00
82e03905f5
* [qt5] MinGW build fixes * [qt5] Remove e-mail headers from mingw9.patch * [qt5] Run vcpkg x-add-version * Cleanup qt5-base icu libs setup Windows-shared needs different options. Patch obsolete. * Check early for mingw32-make * Revise make install path fixup --------- Co-authored-by: Kai Pastor <dg0yt@darc.de>
22 lines
954 B
Diff
22 lines
954 B
Diff
diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp
|
|
index 075ce0ffac..0d3dd2e0b2 100644
|
|
--- a/src/corelib/io/qfilesystemengine_win.cpp
|
|
+++ b/src/corelib/io/qfilesystemengine_win.cpp
|
|
@@ -627,14 +627,14 @@ QFileSystemEntry QFileSystemEngine::absoluteName(const QFileSystemEntry &entry)
|
|
return QFileSystemEntry(ret, QFileSystemEntry::FromInternalPath());
|
|
}
|
|
|
|
-#if defined(Q_CC_MINGW) && WINVER < 0x0602 // Windows 8 onwards
|
|
+#if defined(Q_CC_MINGW) && WINVER < 0x0602 && _WIN32_WINNT < _WIN32_WINNT_WIN8 // Windows 8 onwards
|
|
|
|
typedef struct _FILE_ID_INFO {
|
|
ULONGLONG VolumeSerialNumber;
|
|
FILE_ID_128 FileId;
|
|
} FILE_ID_INFO, *PFILE_ID_INFO;
|
|
|
|
-#endif // if defined (Q_CC_MINGW) && WINVER < 0x0602
|
|
+#endif // if defined(Q_CC_MINGW) && WINVER < 0x0602 && _WIN32_WINNT < _WIN32_WINNT_WIN8
|
|
|
|
// File ID for Windows up to version 7 and FAT32 drives
|
|
static inline QByteArray fileId(HANDLE handle)
|