qt5-doc: add patches for clangarm64 build

This commit is contained in:
GH Cao
2022-04-12 18:33:42 +08:00
parent 690e210c93
commit eb4412597f
2 changed files with 29 additions and 0 deletions

View File

@@ -0,0 +1,26 @@
--- a/qtbase/src/corelib/global/qt_windows.h
+++ b/qtbase/src/corelib/global/qt_windows.h
@@ -45,6 +45,11 @@
#pragma qt_sync_stop_processing
#endif
+#ifndef NOMINMAX
+# define NOMINMAX
+#endif
+#include <windows.h>
+
#if defined(Q_CC_MINGW)
// mingw's windows.h does not set _WIN32_WINNT, resulting breaking compilation
# ifndef WINVER
@@ -58,11 +63,6 @@
# endif
#endif
-#ifndef NOMINMAX
-# define NOMINMAX
-#endif
-#include <windows.h>
-
#if defined(_WIN32_IE) && _WIN32_IE < 0x0501
# undef _WIN32_IE
#endif

View File

@@ -76,6 +76,7 @@ source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/singl
0060-activeqt-handle-win64-in-dumpcpp.patch
0062-fix-static-build-big-resources.patch
0063-enable-mingw-schannel-alpn.patch
0064-fix-mingw-win32-winnt-detection.patch
0125-qt5-windeployqt-fixes.patch
0300-qt-5.8.0-cast-errors.patch
0302-ugly-hack-disable-qdoc-build.patch
@@ -144,6 +145,7 @@ prepare() {
0060-activeqt-handle-win64-in-dumpcpp.patch \
0062-fix-static-build-big-resources.patch \
0063-enable-mingw-schannel-alpn.patch \
0064-fix-mingw-win32-winnt-detection.patch \
0125-qt5-windeployqt-fixes.patch \
0300-qt-5.8.0-cast-errors.patch \
0304-qtdeclarative-disable-dx12.patch \
@@ -295,6 +297,7 @@ sha256sums=('b7412734698a87f4a0ae20751bab32b1b07fdc351476ad8e35328dbe10efdedb'
'928a8eaca8840ff353cdff8fd11140724cb89094e6115fdd7b8cf534830adcca'
'f07ff4f72626b91aa67ce7ffc78ce7c7c5765bf5431a65b7d867b5f66fa1506b'
'f930338562119f542b550e3cdb802f1f7ebd476f54dd7297db424271167394b0'
'6fc871c9a3697666c19d5c21a8f038b80c9c825b418435b0723bf35a9e532d91'
'28ad823dc8b6665de7b552e82411a8b7b25bf716c42597d8dc8644bded63199c'
'9ea7aeb486023f3aebf1af44603ebd9266009aaeaf91e52c37c8c5154ea3900c'
'7e57ce20b6707bc3b4a727da3287cadda13a74317d86515358b2535bc15244c7'