diff --git a/.gitmodules b/.gitmodules index b4ff6901..92d3bdfe 100644 --- a/.gitmodules +++ b/.gitmodules @@ -305,3 +305,4 @@ url = https://github.com/qt/qtwebglplugin.git branch = 5.12.3 status = addon + diff --git a/build_opensource.sh b/build_opensource.sh index 158f6745..8bce3384 100644 --- 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 - diff --git a/make_universal.py b/make_universal.py index 094220bf..327af82b 100644 --- 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) diff --git a/qt.conf b/qt.conf new file mode 100644 index 00000000..7c8013cf --- /dev/null +++ b/qt.conf @@ -0,0 +1,3 @@ +[Paths] +Prefix=.. +Plugins=../plugins diff --git a/qtbase b/qtbase index 9261bd98..a46c2553 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9261bd98bdd342f2e5aeec6c1d3c32b7388e0b54 +Subproject commit a46c2553f4402f113629138ba8db3d7498ef22bf diff --git a/qtmultimedia b/qtmultimedia index 6ad847ff..6191083e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6ad847ff12071fdf5d9ede989399cb776c644f7b +Subproject commit 6191083e4837fad094ca4eff7406c3e4f8bc1c4e