Use macOS version from the packaging rules to build Qt

Use macOS 12 as the building platform for Qt. macOS 10.14 will be
deprecated as the building platform in Qt 6.5.

Change-Id: I14d850a489efced84aa1e7e294d2ae75f5efa3de
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit c0ecadc049)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexey Edelev
2022-08-02 14:28:16 +02:00
committed by Qt Cherry-pick Bot
parent af17636e41
commit 188e774a60
2 changed files with 5 additions and 5 deletions

View File

@@ -2,7 +2,7 @@ Version: 2
Configurations:
-
Id: 'android-arm64-on-macos'
Template: 'qtci-macos-10.14-x86_64'
Template: 'qtci-macos-12-x86_64-102'
Target os: 'Android_ANY'
Target arch: 'arm64'
Compiler: 'Clang'
@@ -16,7 +16,7 @@ Configurations:
'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-arm64-clang'
]
-
Template: 'qtci-macos-10.14-x86_64'
Template: 'qtci-macos-12-x86_64-102'
Target os: 'Android_ANY'
Target arch: 'armv7'
Compiler: 'Clang'
@@ -30,7 +30,7 @@ Configurations:
'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-armv7-clang'
]
-
Template: 'qtci-macos-10.14-x86_64'
Template: 'qtci-macos-12-x86_64-102'
Target os: 'Android_ANY'
Target arch: 'x86'
Compiler: 'Clang'
@@ -44,7 +44,7 @@ Configurations:
'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86-clang'
]
-
Template: 'qtci-macos-10.14-x86_64'
Template: 'qtci-macos-12-x86_64-102'
Target os: 'Android_ANY'
Target arch: 'x86_64'
Compiler: 'Clang'

View File

@@ -38,7 +38,7 @@ Configurations:
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-webassembly-x86_64-clang']
-
Template: 'qtci-macos-10.14-x86_64'
Template: 'qtci-macos-12-x86_64-102'
Target os: 'WebAssembly'
Compiler: 'Clang'
Target compiler: 'Clang'