aboutsummaryrefslogtreecommitdiffstats
path: root/coin/platform_configs/default.txt
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-10-20 14:17:57 +0200
committerLiang Qi <liang.qi@qt.io>2018-10-20 14:17:57 +0200
commit16c6fa419a9c16ea5573eb5080c4241739a36c8b (patch)
tree68f1b3072e4ca38576fe50c796ea08e11b4ff8aa /coin/platform_configs/default.txt
parent0345ab91fbce6e5a11a9f1a05ec8f50ae4bcade5 (diff)
parent4667cfc432a97bf0400c2e4ecf2c1fbd535eae63 (diff)
Merge remote-tracking branch 'origin/5.12' into dev
Diffstat (limited to 'coin/platform_configs/default.txt')
-rw-r--r--coin/platform_configs/default.txt9
1 files changed, 5 insertions, 4 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index 7c07d4dd..c2d5efdc 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -12,12 +12,13 @@ qtci-linux-Ubuntu-18.04-x86_64 GCC
qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch
qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite
qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo
-qtci-macos-10.13-x86_64 Clang Packaging DebugAndRelease Release
+qtci-macos-10.13-x86_64-2 Clang Packaging DebugAndRelease Release
qtci-macos-10.12-x86_64-8 Clang DeveloperBuild NoFramework Release QtNamespace NoPch
-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-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static
+qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang DebugAndRelease DisableTests
+qtci-macos-10.13-x86_64-2 WatchOS_ANY multi Clang DebugAndRelease DisableTests
qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.4-x86_64 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC Release
qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC Release
qtci-linux-Ubuntu-18.04-x86_64 GCC TestOnly LicenseCheck