mirror of
git://code.qt.io/qt/qt5.git
synced 2026-09-25 18:06:40 +08:00
Remove universal build of Qt for iOS
Now that we have individual builds for device, and arm64 and x86_64 simulator, as a workaround for lacking xcframework support. Pick-to: 6.12 Change-Id: Ifff43080b32bcab80e5cbf54f9b23ecd443480a6 Reviewed-by: Alexandru Croitor <[email protected]>
This commit is contained in:
@@ -366,19 +366,6 @@ Configurations:
|
||||
'VCPKG_HOST_TRIPLET=x64-linux-qt',
|
||||
'VCPKG_TARGET_TRIPLET=x64-linux-qt',
|
||||
]
|
||||
-
|
||||
Id: 'ios-universal'
|
||||
Template: 'qtci-macos-26-arm-105'
|
||||
Target os: 'IOS_ANY'
|
||||
Target arch: 'arm64'
|
||||
Compiler: 'Clang'
|
||||
Target compiler: 'Clang'
|
||||
Platform dependency: 'macos-universal-on-arm64'
|
||||
Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure', 'WarningsAreErrors', 'GenerateSBOM', 'VerifySBOM']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang',
|
||||
'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include -DFFMPEG_DIR={{.Env.FFMPEG_DIR_IOS}} -DQT_DEPLOY_FFMPEG=TRUE',
|
||||
]
|
||||
-
|
||||
Id: 'ios-device'
|
||||
Template: 'qtci-macos-26-arm-105'
|
||||
|
||||
@@ -2,7 +2,7 @@ Version: 2
|
||||
Module only: True
|
||||
Include: [
|
||||
cmake_platforms.yaml: [
|
||||
"ios-universal"
|
||||
"ios-arm64-simulator"
|
||||
]
|
||||
]
|
||||
Configurations:
|
||||
@@ -12,7 +12,7 @@ Configurations:
|
||||
Compiler: 'Clang'
|
||||
Target os: 'IOS_ANY'
|
||||
Target arch: 'arm64'
|
||||
Platform dependency: 'ios-universal'
|
||||
Platform dependency: 'ios-arm64-simulator'
|
||||
Features: ['TestOnly', 'Insignificant', 'DoNotAbortTestingOnFirstFailure']
|
||||
Environment variables: [
|
||||
'APPLE_SIMULATOR_DEVICE_TYPE=com.apple.CoreSimulator.SimDeviceType.iPad-Pro-13-inch-M4-8GB',
|
||||
|
||||
@@ -7,7 +7,7 @@ Include: [
|
||||
"ubuntu-22.04-developer-build-x11-tests",
|
||||
"ubuntu-24.04-x64",
|
||||
"windows-11_24H2-msvc2022-developer-build",
|
||||
"ios-universal",
|
||||
"ios-device",
|
||||
"documentation-warnings",
|
||||
],
|
||||
macos.yaml: [
|
||||
|
||||
Reference in New Issue
Block a user