mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 02:48:59 +08:00
[qt5-base & qtbase] Fix error on arm64-windows (#41536)
Co-authored-by: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com>
This commit is contained in:
parent
f56b56e016
commit
1d6bcca58a
18
ports/qt5-base/patches/qmake-arm64.patch
Normal file
18
ports/qt5-base/patches/qmake-arm64.patch
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
diff --git a/qmake/library/qmakeevaluator.cpp b/qmake/library/qmakeevaluator.cpp
|
||||||
|
index df3f92d7d5df..0ee8cdbf11e1 100644
|
||||||
|
--- a/qmake/library/qmakeevaluator.cpp
|
||||||
|
+++ b/qmake/library/qmakeevaluator.cpp
|
||||||
|
@@ -1046,6 +1046,11 @@ void QMakeEvaluator::loadDefaults()
|
||||||
|
case PROCESSOR_ARCHITECTURE_AMD64:
|
||||||
|
archStr = ProString("x86_64");
|
||||||
|
break;
|
||||||
|
+# endif
|
||||||
|
+# ifdef PROCESSOR_ARCHITECTURE_ARM64
|
||||||
|
+ case PROCESSOR_ARCHITECTURE_ARM64:
|
||||||
|
+ archStr = ProString("arm64");
|
||||||
|
+ break;
|
||||||
|
# endif
|
||||||
|
case PROCESSOR_ARCHITECTURE_INTEL:
|
||||||
|
archStr = ProString("x86");
|
||||||
|
--
|
||||||
|
2.16.3
|
@ -76,6 +76,8 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH
|
|||||||
patches/fix_angle.patch # Failed to create OpenGL context for format QSurfaceFormat ...
|
patches/fix_angle.patch # Failed to create OpenGL context for format QSurfaceFormat ...
|
||||||
patches/mingw9.patch # Fix compile with MinGW-W64 9.0.0: Redefinition of 'struct _FILE_ID_INFO'
|
patches/mingw9.patch # Fix compile with MinGW-W64 9.0.0: Redefinition of 'struct _FILE_ID_INFO'
|
||||||
patches/XKB_KEY_dead_lowline.patch # https://bugreports.qt.io/browse/QTBUG-117950
|
patches/XKB_KEY_dead_lowline.patch # https://bugreports.qt.io/browse/QTBUG-117950
|
||||||
|
|
||||||
|
patches/qmake-arm64.patch # Fix by Oliver Wolff to support ARM64 hosts on Windows
|
||||||
)
|
)
|
||||||
|
|
||||||
# Remove vendored dependencies to ensure they are not picked up by the build
|
# Remove vendored dependencies to ensure they are not picked up by the build
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "qt5-base",
|
"name": "qt5-base",
|
||||||
"version": "5.15.15",
|
"version": "5.15.15",
|
||||||
|
"port-version": 1,
|
||||||
"description": "Qt Base provides the basic non-GUI functionality required by all Qt applications.",
|
"description": "Qt Base provides the basic non-GUI functionality required by all Qt applications.",
|
||||||
"homepage": "https://www.qt.io/",
|
"homepage": "https://www.qt.io/",
|
||||||
"license": null,
|
"license": null,
|
||||||
|
@ -22,6 +22,7 @@ set(${PORT}_PATCHES
|
|||||||
fix-host-aliasing.patch
|
fix-host-aliasing.patch
|
||||||
fix_deploy_windows.patch
|
fix_deploy_windows.patch
|
||||||
fix-link-lib-discovery.patch
|
fix-link-lib-discovery.patch
|
||||||
|
qmake-arm64.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
|
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
|
||||||
|
18
ports/qtbase/qmake-arm64.patch
Normal file
18
ports/qtbase/qmake-arm64.patch
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
diff --git a/qmake/library/qmakeevaluator.cpp b/qmake/library/qmakeevaluator.cpp
|
||||||
|
index df3f92d7d5df..0ee8cdbf11e1 100644
|
||||||
|
--- a/qmake/library/qmakeevaluator.cpp
|
||||||
|
+++ b/qmake/library/qmakeevaluator.cpp
|
||||||
|
@@ -1046,6 +1046,11 @@ void QMakeEvaluator::loadDefaults()
|
||||||
|
case PROCESSOR_ARCHITECTURE_AMD64:
|
||||||
|
archStr = ProString("x86_64");
|
||||||
|
break;
|
||||||
|
+# endif
|
||||||
|
+# ifdef PROCESSOR_ARCHITECTURE_ARM64
|
||||||
|
+ case PROCESSOR_ARCHITECTURE_ARM64:
|
||||||
|
+ archStr = ProString("arm64");
|
||||||
|
+ break;
|
||||||
|
# endif
|
||||||
|
case PROCESSOR_ARCHITECTURE_INTEL:
|
||||||
|
archStr = ProString("x86");
|
||||||
|
--
|
||||||
|
2.16.3
|
@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "qtbase",
|
"name": "qtbase",
|
||||||
"version": "6.7.3",
|
"version": "6.7.3",
|
||||||
|
"port-version": 1,
|
||||||
"description": "Qt Base (Core, Gui, Widgets, Network, ...)",
|
"description": "Qt Base (Core, Gui, Widgets, Network, ...)",
|
||||||
"homepage": "https://www.qt.io/",
|
"homepage": "https://www.qt.io/",
|
||||||
"license": null,
|
"license": null,
|
||||||
|
@ -7342,7 +7342,7 @@
|
|||||||
},
|
},
|
||||||
"qt5-base": {
|
"qt5-base": {
|
||||||
"baseline": "5.15.15",
|
"baseline": "5.15.15",
|
||||||
"port-version": 0
|
"port-version": 1
|
||||||
},
|
},
|
||||||
"qt5-canvas3d": {
|
"qt5-canvas3d": {
|
||||||
"baseline": "0",
|
"baseline": "0",
|
||||||
@ -7510,7 +7510,7 @@
|
|||||||
},
|
},
|
||||||
"qtbase": {
|
"qtbase": {
|
||||||
"baseline": "6.7.3",
|
"baseline": "6.7.3",
|
||||||
"port-version": 0
|
"port-version": 1
|
||||||
},
|
},
|
||||||
"qtcharts": {
|
"qtcharts": {
|
||||||
"baseline": "6.7.3",
|
"baseline": "6.7.3",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "6ae808ff9831e8fc3c9f31e0ec0ac71b2e9d3a4e",
|
||||||
|
"version": "5.15.15",
|
||||||
|
"port-version": 1
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "99dfc2c88d6a863afc5eef00463166c50e5e12d2",
|
"git-tree": "99dfc2c88d6a863afc5eef00463166c50e5e12d2",
|
||||||
"version": "5.15.15",
|
"version": "5.15.15",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "f176facc532ba6e294f1627343e8f7c3ee686676",
|
||||||
|
"version": "6.7.3",
|
||||||
|
"port-version": 1
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "175c7c5f08049a07e1b18f39e622e82a60a16147",
|
"git-tree": "175c7c5f08049a07e1b18f39e622e82a60a16147",
|
||||||
"version": "6.7.3",
|
"version": "6.7.3",
|
||||||
|
Loading…
Reference in New Issue
Block a user