-
Notifications
You must be signed in to change notification settings - Fork 6.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* [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>
- Loading branch information
Showing
10 changed files
with
79 additions
and
54 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,33 @@ | ||
| #Could probably be a vcpkg_fix_makefile_install for other ports? | ||
| function(qt_fix_makefile_install BUILD_DIR) | ||
| #Fix the installation location | ||
| file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" NATIVE_INSTALLED_DIR) | ||
| file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" NATIVE_PACKAGES_DIR) | ||
|
|
||
| if(WIN32) | ||
| string(SUBSTRING "${NATIVE_INSTALLED_DIR}" 2 -1 INSTALLED_DIR_WITHOUT_DRIVE) | ||
| string(SUBSTRING "${NATIVE_PACKAGES_DIR}" 2 -1 PACKAGES_DIR_WITHOUT_DRIVE) | ||
| set(MSYS_HACK "") | ||
| if(VCPKG_HOST_IS_WINDOWS) | ||
| file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" NATIVE_INSTALLED_DIR) | ||
| file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" NATIVE_PACKAGES_DIR) | ||
| if(VCPKG_TARGET_IS_MINGW) | ||
| set(MSYS_HACK ":@msyshack@%=%") | ||
| file(STRINGS "${BUILD_DIR}/Makefile" using_sh REGEX "= rm -f") | ||
| if(using_sh) | ||
| set(NATIVE_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}") | ||
| set(NATIVE_PACKAGES_DIR "${CURRENT_PACKAGES_DIR}") | ||
| endif() | ||
| endif() | ||
| string(SUBSTRING "${NATIVE_INSTALLED_DIR}" 0 2 INSTALLED_DRIVE) | ||
| string(SUBSTRING "${NATIVE_PACKAGES_DIR}" 0 2 PACKAGES_DRIVE) | ||
| string(SUBSTRING "${NATIVE_INSTALLED_DIR}" 2 -1 INSTALLED_DIR_WITHOUT_DRIVE) | ||
| string(SUBSTRING "${NATIVE_PACKAGES_DIR}" 2 -1 PACKAGES_DIR_WITHOUT_DRIVE) | ||
| else() | ||
| set(INSTALLED_DRIVE) | ||
| set(PACKAGES_DRIVE) | ||
| set(INSTALLED_DIR_WITHOUT_DRIVE ${NATIVE_INSTALLED_DIR}) | ||
| set(PACKAGES_DIR_WITHOUT_DRIVE ${NATIVE_PACKAGES_DIR}) | ||
| set(INSTALLED_DRIVE "") | ||
| set(PACKAGES_DRIVE "") | ||
| set(INSTALLED_DIR_WITHOUT_DRIVE "${CURRENT_INSTALLED_DIR}") | ||
| set(PACKAGES_DIR_WITHOUT_DRIVE "${CURRENT_PACKAGES_DIR}") | ||
| endif() | ||
| set(installed "${INSTALLED_DRIVE}$(INSTALL_ROOT${MSYS_HACK})${INSTALLED_DIR_WITHOUT_DRIVE}") | ||
| set(packages "${PACKAGES_DRIVE}$(INSTALL_ROOT${MSYS_HACK})${PACKAGES_DIR_WITHOUT_DRIVE}") | ||
|
|
||
| file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" NATIVE_INSTALLED_DIR) | ||
| file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" NATIVE_PACKAGES_DIR) | ||
|
|
||
| file(GLOB_RECURSE MAKEFILES "${BUILD_DIR}/*Makefile*") | ||
|
|
||
| foreach(MAKEFILE ${MAKEFILES}) | ||
| file(READ "${MAKEFILE}" _contents) | ||
| #Set the correct install directory to packages | ||
| string(REPLACE "${INSTALLED_DRIVE}$(INSTALL_ROOT)${INSTALLED_DIR_WITHOUT_DRIVE}" "${PACKAGES_DRIVE}$(INSTALL_ROOT)${PACKAGES_DIR_WITHOUT_DRIVE}" _contents "${_contents}") | ||
| file(WRITE "${MAKEFILE}" "${_contents}") | ||
| vcpkg_replace_string("${MAKEFILE}" "${installed}" "${packages}") | ||
| endforeach() | ||
| endfunction() | ||
| endfunction() |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| 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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters