lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-05-08 12:07:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bump macOS 14 build targets to macOS 15

Browse Source 
In preparation for minimum Xcode and SDK bump.

Change-Id: Id5ebffff76338b821c42b347e643a7822abc2eff
Reviewed-by: Nils Petter Skålerud <nils.petter.skalerud@qt.io>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
This commit is contained in:
Tor Arne Vestbø
2026-04-29 14:26:14 +02:00
parent 8adbc25578
commit 0d73eb6948
11 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/platform_configs/cmake_platforms.yaml
View File

@@ -280,7 +280,7 @@ Configurations:
] ]
- -
Id: 'ios-universal' Id: 'ios-universal'
Template: 'qtci-macos-14-arm-106' Template: 'qtci-macos-15-arm-104'
Target os: 'IOS_ANY' Target os: 'IOS_ANY'
Target arch: 'arm64' Target arch: 'arm64'
Compiler: 'Clang' Compiler: 'Clang'

2
coin/platform_configs/cmake_platforms_static_release.yaml
View File

@@ -55,7 +55,7 @@ Configurations:
- -
Id: 'macos-universal-on-x86_64-minimal-static-test' Id: 'macos-universal-on-x86_64-minimal-static-test'
Template: 'qtci-macos-14-x86_64-105' Template: 'qtci-macos-15-x86_64-103'
Compiler: 'Clang' Compiler: 'Clang'
Target arch: 'x86_64-arm64' Target arch: 'x86_64-arm64'
Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'MinimalStaticTests'] Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'MinimalStaticTests']

2
coin/platform_configs/cmake_platforms_static_tests.yaml
View File

@@ -27,7 +27,7 @@ Configurations:
] ]
- -
Id: 'macos-minimal-static' Id: 'macos-minimal-static'
Template: 'qtci-macos-14-arm-106' Template: 'qtci-macos-15-arm-104'
Compiler: 'Clang' Compiler: 'Clang'
Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure'] Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
Configure arguments: '-nomake examples -release -force-debug-info -static -no-framework' Configure arguments: '-nomake examples -release -force-debug-info -static -no-framework'

2
coin/platform_configs/cmake_platforms_target_android.yaml
View File

@@ -2,7 +2,7 @@ Version: 2
Configurations: Configurations:
- -
Id: 'android-arm64-on-macos' Id: 'android-arm64-on-macos'
Template: 'qtci-macos-14-arm-106' Template: 'qtci-macos-15-arm-104'
Target os: 'Android_ANY' Target os: 'Android_ANY'
Target arch: 'arm64' Target arch: 'arm64'
Compiler: 'Clang' Compiler: 'Clang'

2
coin/platform_configs/ios-tests.yaml
View File

@@ -2,7 +2,7 @@ Version: 2
Configurations: Configurations:
- -
Id: "ios-tests-on-macos" Id: "ios-tests-on-macos"
Template: 'qtci-macos-14-arm-106' Template: 'qtci-macos-15-arm-104'
Target os: 'IOS_ANY' Target os: 'IOS_ANY'
Target arch: 'arm64' Target arch: 'arm64'
Compiler: 'Clang' Compiler: 'Clang'

2
coin/platform_configs/nightly_unity_builds.yaml
View File

@@ -46,7 +46,7 @@ Configurations:
] ]
- -
Id: 'macos-universal-on-arm64-unity-build' Id: 'macos-universal-on-arm64-unity-build'
Template: 'qtci-macos-14-arm-106' Template: 'qtci-macos-15-arm-104'
Compiler: 'Clang' Compiler: 'Clang'
Target arch: 'x86_64-arm64' Target arch: 'x86_64-arm64'
Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']

2
coin/platform_configs/qtgradleplugin.yaml
View File

@@ -8,7 +8,7 @@ Configurations:
Features: ['Packaging', 'UseConfigure'] Features: ['Packaging', 'UseConfigure']
- -
Id: 'qtgp-on-macos' Id: 'qtgp-on-macos'
Template: 'qtci-macos-14-arm-106' Template: 'qtci-macos-15-arm-104'
Compiler: 'Clang' Compiler: 'Clang'
Features: ['TestOnly'] Features: ['TestOnly']
- -

4
coin/platform_configs/qtsaferenderer.yaml
View File

@@ -30,8 +30,8 @@ Include: [
# Static build configurations for tools # Static build configurations for tools
Configurations: Configurations:
- -
Id: 'macos-14-latest-xcode-universal_Static' Id: 'macos-latest-xcode-universal_Static'
Template: 'qtci-macos-14-arm-106' Template: 'qtci-macos-15-arm-104'
Compiler: 'Clang' Compiler: 'Clang'
Target arch: 'x86_64-arm64' Target arch: 'x86_64-arm64'
Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests'] Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']

4
coin/platform_configs/quick-minimal.yaml
View File

@@ -426,7 +426,7 @@ Configurations:
] ]
- -
Id: 'android-quick-minimal' Id: 'android-quick-minimal'
Template: 'qtci-macos-14-arm-106' Template: 'qtci-macos-15-arm-104'
Target os: 'Android_ANY' Target os: 'Android_ANY'
Target arch: 'arm64' Target arch: 'arm64'
Compiler: 'Clang' Compiler: 'Clang'
@@ -832,7 +832,7 @@ Configurations:
] ]
- -
Id: 'ios-quick-minimal' Id: 'ios-quick-minimal'
Template: 'qtci-macos-14-arm-106' Template: 'qtci-macos-15-arm-104'
Target os: 'IOS_ANY' Target os: 'IOS_ANY'
Target arch: 'arm64' Target arch: 'arm64'
Compiler: 'Clang' Compiler: 'Clang'

7
coin/provisioning/qtci-macos-15-arm/50-openssl_for_android_darwin.sh Executable file
View File

@@ -0,0 +1,7 @@
#!/usr/bin/env bash
# Copyright (C) 2025 The Qt Company Ltd.
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
set -ex
# shellcheck source=../common/unix/openssl_for_android.sh
source "${BASH_SOURCE%/*}/../common/unix/openssl_for_android.sh"

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

@@ -5,5 +5,5 @@
set -ex set -ex
source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal" 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-android.sh" "android-arm64" "use_16kb_page_size"
source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-ios.sh" source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-ios.sh"