lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-27 09:16:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move install-ffmpeg-ios.sh into macos folder

Browse Source 
Currently this script is stored under unix, but it's only ever going to
be used on macos. This patch moves the script.

No functional changes.

There was a minor conflict resolution in this patch due to macOS 26 not
being present in this branch.

Pick-to: 6.8
Change-Id: Iba3d101d360e90ffaa3478689bb002b4e5f65bc1
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit ebe3124831)
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
(cherry picked from commit 1d998afee6)
This commit is contained in:
Nils Petter Skålerud
2026-02-09 13:35:34 +01:00
parent e9e8d7965f
commit e41fdd0e35
9 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
coin/provisioning/common/unix/install-ffmpeg-ios.sh → coin/provisioning/common/macos/install-ffmpeg-ios.sh
View File

2
coin/provisioning/qtci-macos-12-arm/90-install-ffmpeg.sh
View File

@@ -6,4 +6,4 @@ set -ex
source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal"
#source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size"
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"
source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-ios.sh"

2
coin/provisioning/qtci-macos-12-x86_64/90-install-ffmpeg.sh
View File

@@ -6,4 +6,4 @@ set -ex
source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal"
#source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size"
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"
source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-ios.sh"

2
coin/provisioning/qtci-macos-13-arm/90-install-ffmpeg.sh
View File

@@ -6,4 +6,4 @@ set -ex
source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal"
#source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size"
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"
source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-ios.sh"

2
coin/provisioning/qtci-macos-13-x86_64/90-install-ffmpeg.sh
View File

@@ -6,4 +6,4 @@ set -ex
source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal"
#source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size"
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"
source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-ios.sh"

2
coin/provisioning/qtci-macos-14-arm/90-install-ffmpeg.sh
View File

@@ -6,4 +6,4 @@ set -ex
source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal"
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size"
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"
source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-ios.sh"

2
coin/provisioning/qtci-macos-14-x86_64/90-install-ffmpeg.sh
View File

@@ -6,4 +6,4 @@ set -ex
source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal"
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size"
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"
source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-ios.sh"

2
coin/provisioning/qtci-macos-15-arm/90-install-ffmpeg.sh
View File

@@ -6,4 +6,4 @@ set -ex
source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal"
#source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size"
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"
source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-ios.sh"

2
coin/provisioning/qtci-macos-15-x86_64/90-install-ffmpeg.sh
View File

@@ -6,4 +6,4 @@ set -ex
source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal"
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size"
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"
source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-ios.sh"