feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix build with MinGW

Browse Source 
Tested successfully with MinGW 8.1.0

Change-Id: Iac6493e055b74b8089afda2f076f0235b62af72a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Cristian Adam
2019-05-09 16:13:57 +02:00
parent d116559cd8
commit e5f7df2eaa
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/utils/fileutils.cpp
View File

@@ -44,6 +44,10 @@
#endif #endif
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
// We need defines for Windows 8
#undef _WIN32_WINNT
#define _WIN32_WINNT _WIN32_WINNT_WIN8
#include <qt_windows.h> #include <qt_windows.h>
#include <shlobj.h> #include <shlobj.h>
#endif #endif
@@ -359,14 +363,6 @@ FileName FileUtils::commonPath(const FileName &oldCommonPath, const FileName &fi
// Copied from qfilesystemengine_win.cpp // Copied from qfilesystemengine_win.cpp
#ifdef Q_OS_WIN #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. // File ID for Windows up to version 7.
static inline QByteArray fileIdWin7(HANDLE handle) static inline QByteArray fileIdWin7(HANDLE handle)