daaec2a925
* qt5-git: changed branch to "5.9". Very major changes to prepare and pkgver fuctions. Added prepare_build_folder and other helper functions. Copied code from qt5 and qt5-static packages. Renamed patch filenames to match qt5.8 or "-qt-5.6-" names. And, many formatting changes. * qt5-git: Added patch files. Added new patch files: 0001-qt-5.9.1-fix-sql-libraries-mingw.patch 0002-qt-5.8.1-configure-gcc-before-clang.patch 0007-qt-5.9.0-win32-g-Enable-static-builds.patch 0024-qt-5.9.2-icu-add-U_LIB_SUFFIX_C_NAME.patch 0051-qt-5.9.0-disable-qtlocation-mapboxgl-plugin.patch 0051-qt-5.9.1-disable-qtlocation-mapboxgl-plugin.patch And, from qt5 package added 0001-qt-5.8.0-fix-sql-libraries-mingw.patch 0002-qt-5.8.0-configure-gcc-before-clang.patch 0003-qt-5.8.0-autodetect-fontconfig.patch 0011-qt-5.8.0-mingw-dbus-and-pkg-config.patch 0016-qt-5.8.0-win32-g++-use-qpa-genericunixfontdatabase.patch 0020-qt-5.3.0-use-external-angle-library.patch 0023-qt-5.3.0-env-set-external-angle.patch 0025-qt-5.8.0-force-using-make-on-msys.patch 0028-qt-5.8.0-Revert-untangle-use-of-system-vs.-shell-path-list-se.patch 0029-qt-5.8.0-Revert-fix-quoting-and-path-separators-in-qtPrepareT.patch 0046-qt-5.4.1-Revert-Revert-fix-NTFS-mount-points.patch 0049-qt-5.8.0-win32-do-not-use-fontconfig.patch 0049-qt-5.9.0-win32-do-not-use-fontconfig.patch 0125-qt-5.8.0-windeployqt-fixes.patch 0125-qt-5.9.0-windeployqt-fixes.patch 0300-qt-5.8.0-cast-errors.patch * qt5-git: Rename patch files files. Renamed qt5-git 5.7 patch files to match the ones in the qt5 5.8 package; Or, renamed patch files with "-qt-5.6-" after seq. number. * qt5-git: Changed to pcre2 from pcre depends.
12 lines
800 B
Diff
12 lines
800 B
Diff
--- x86_64/qtbase/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp.orig 2017-01-26 15:35:53.584495700 +0300
|
|
+++ x86_64/qtbase/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp 2017-01-26 15:40:06.088564600 +0300
|
|
@@ -113,7 +113,7 @@
|
|
UINT size;
|
|
DWORD *fi;
|
|
|
|
- if (VerQueryValue(info.constData(), __TEXT("\\"), (LPVOID *) &fi, &size) && size) {
|
|
+ if (VerQueryValue(info.data(), __TEXT("\\"), (LPVOID *) &fi, &size) && size) {
|
|
VS_FIXEDFILEINFO *verInfo = (VS_FIXEDFILEINFO *) fi;
|
|
return Direct2DVersion(HIWORD(verInfo->dwFileVersionMS),
|
|
LOWORD(verInfo->dwFileVersionMS),
|