qiurui
/
qt5
mirror of https://github.com/qt/qt5.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the compilation error of adding the ARM architecture

This commit is contained in:
jingjing_tang 2025-09-15 15:35:00 +08:00
parent e8d2d636f5
commit 6fbc6dd226
6 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitmodules vendored
View File

@ -305,3 +305,4 @@
url = https://github.com/qt/qtwebglplugin.git url = https://github.com/qt/qtwebglplugin.git
branch = 5.12.3 branch = 5.12.3
status = addon status = addon

1
build_opensource.sh
View File

@ -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 cp $prj_path/Qt5.12.3_x86_64/bin/macdeployqt $prj_path/Qt5.12.3/bin
# qt.conf 用来指定当前 qmake 所依赖的的 Qt 库 # qt.conf 用来指定当前 qmake 所依赖的的 Qt 库
cp qt.conf $prj_path/Qt5.12.3/bin cp qt.conf $prj_path/Qt5.12.3/bin

1
make_universal.py
View File

@ -8,7 +8,6 @@ success = 0
failed = 0 failed = 0
skipped = 0 skipped = 0
def check_arch(file_name, arch): def check_arch(file_name, arch):
# print("lipo " + file_name + " -verify_arch " + arch) # print("lipo " + file_name + " -verify_arch " + arch)
return os.system("lipo " + file_name + " -verify_arch " + arch) return os.system("lipo " + file_name + " -verify_arch " + arch)

3
qt.conf Normal file
View File

@ -0,0 +1,3 @@
[Paths]
Prefix=..
Plugins=../plugins

2
qtbase

@ -1 +1 @@
Subproject commit 9261bd98bdd342f2e5aeec6c1d3c32b7388e0b54 Subproject commit a46c2553f4402f113629138ba8db3d7498ef22bf

2
qtmultimedia

@ -1 +1 @@
Subproject commit 6ad847ff12071fdf5d9ede989399cb776c644f7b Subproject commit 6191083e4837fad094ca4eff7406c3e4f8bc1c4e