Fix the compilation error of adding the ARM architecture

2025-09-15 15:35:00 +08:00 · 2025-09-15 15:35:00 +08:00 · 6fbc6dd226
parent e8d2d636f5
commit 6fbc6dd226
6 changed files with 6 additions and 4 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -305,3 +305,4 @@
 	url = https://github.com/qt/qtwebglplugin.git
 	branch = 5.12.3
 	status = addon
+
--- a/build_opensource.sh
+++ b/build_opensource.sh
@ -58,4 +58,3 @@ python3 make_universal.py $prj_path/Qt5.12.3 $prj_path/Qt5.12.3_x86_64 $prj_path
 cp $prj_path/Qt5.12.3_x86_64/bin/macdeployqt $prj_path/Qt5.12.3/bin
 # qt.conf 用来指定当前 qmake 所依赖的的 Qt 库
 cp qt.conf $prj_path/Qt5.12.3/bin
-
--- a/make_universal.py
+++ b/make_universal.py
@ -8,7 +8,6 @@ success = 0
 failed = 0
 skipped = 0

-
 def check_arch(file_name, arch):
 #    print("lipo " + file_name + " -verify_arch " + arch)
    return os.system("lipo " + file_name + " -verify_arch " + arch)
--- a/qt.conf
+++ b/qt.conf
@ -0,0 +1,3 @@
+[Paths]
+Prefix=..
+Plugins=../plugins
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 9261bd98bdd342f2e5aeec6c1d3c32b7388e0b54
+Subproject commit a46c2553f4402f113629138ba8db3d7498ef22bf
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 6ad847ff12071fdf5d9ede989399cb776c644f7b
+Subproject commit 6191083e4837fad094ca4eff7406c3e4f8bc1c4e