From e5f7df2eaad21a51c8c9394bfd3609a1951fc12b Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Thu, 9 May 2019 16:13:57 +0200 Subject: [PATCH] Fix build with MinGW Tested successfully with MinGW 8.1.0 Change-Id: Iac6493e055b74b8089afda2f076f0235b62af72a Reviewed-by: Christian Kandeler Reviewed-by: Alessandro Portale --- src/libs/utils/fileutils.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp index cb5537a26da..fbc8134df44 100644 --- a/src/libs/utils/fileutils.cpp +++ b/src/libs/utils/fileutils.cpp @@ -44,6 +44,10 @@ #endif #ifdef Q_OS_WIN +// We need defines for Windows 8 +#undef _WIN32_WINNT +#define _WIN32_WINNT _WIN32_WINNT_WIN8 + #include #include #endif @@ -359,14 +363,6 @@ FileName FileUtils::commonPath(const FileName &oldCommonPath, const FileName &fi // Copied from qfilesystemengine_win.cpp #ifdef Q_OS_WIN -#if WINVER < 0x0602 // Windows 8 onwards - -typedef struct _FILE_ID_INFO { - ULONGLONG VolumeSerialNumber; - FILE_ID_128 FileId; -} FILE_ID_INFO, *PFILE_ID_INFO; - -#endif // if WINVER < 0x0602 // File ID for Windows up to version 7. static inline QByteArray fileIdWin7(HANDLE handle)