From c0ecadc049a89308762450cb3e7297e18fab5716 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Tue, 2 Aug 2022 14:28:16 +0200 Subject: Use macOS version from the packaging rules to build Qt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use macOS 12 as the building platform for Qt. macOS 10.14 will be deprecated as the building platform in Qt 6.5. Pick-to: 6.4 6.3 6.2 Change-Id: I14d850a489efced84aa1e7e294d2ae75f5efa3de Reviewed-by: Tor Arne Vestbø Reviewed-by: Assam Boudjelthia --- .../cmake_platforms_target_android_host_macos.yaml | 8 ++++---- coin/platform_configs/cmake_platforms_wasm.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'coin') diff --git a/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml b/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml index 92614934..66f296dc 100644 --- a/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml +++ b/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml @@ -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' diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index d13d0b29..e54113d8 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -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' -- cgit v1.2.3