From e999cc7df90681556622876baa90b6ec2fb76191 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 27 Aug 2018 09:16:50 +0200 Subject: [PATCH] Move iOS/tvOS/watchOS build host to macOS 10.13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-70180 Change-Id: I6b4b90883cccfdaedbeb0440b62a1b8290655838 Reviewed-by: Tor Arne Vestbø Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.txt | 6 +++--- coin/platform_configs/qt5.txt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 692dd1b0..e856c4f1 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -16,9 +16,9 @@ qtci-macos-10.12-x86_64-8 Clang qtci-macos-10.13-x86_64 Clang DebugAndRelease Release DisableTests qtci-macos-10.12-x86_64-8 Clang DeveloperBuild Release QtNamespace NoPch qtci-macos-10.12-x86_64-8 Clang Release NoFramework DisableTests -qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Release DisableTests Static -qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang Release DisableTests -qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang Release DisableTests +qtci-macos-10.13-x86_64 IOS_ANY multi Clang Release DisableTests Static +qtci-macos-10.13-x86_64 TvOS_ANY multi Clang Release DisableTests +qtci-macos-10.13-x86_64 WatchOS_ANY multi Clang Release DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-16.04-x86_64-2 QEMU armv7 GCC Release qtci-linux-Ubuntu-16.04-x86_64-2 QEMU arm64 GCC Release diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index c188d09b..980b1323 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -13,9 +13,9 @@ qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Packagin qtci-macos-10.12-x86_64-8 Android_ANY armv7 Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 Android_ANY x86 Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static -qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang DebugAndRelease DisableTests -qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang DebugAndRelease DisableTests +qtci-macos-10.13-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static +qtci-macos-10.13-x86_64 TvOS_ANY multi Clang DebugAndRelease DisableTests +qtci-macos-10.13-x86_64 WatchOS_ANY multi Clang DebugAndRelease DisableTests qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2