aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Sarajärvi <tony.sarajarvi@qt.io>2017-03-01 21:58:42 +0100
committerTony Sarajärvi <tony.sarajarvi@qt.io>2017-05-05 04:34:47 +0000
commit4f4de8aa1614cc6fc8d924c13509de869b4471fe (patch)
tree5fcdacf79e1ffc3bd8e0a8ce009fbc8c020fbf33
parent7937eb2d9e19bef89f49db2d510b033f6281af5b (diff)
Change OS X 10.11 to run tests instead of 10.10
This commit removes OS X 10.10 as a developer build target, and enables autotests on osx 10.11 developer build. Task-number: QTQAINFRA-1090 Change-Id: I0ba0a60edd7010eedd3289c400266b4cced6c133 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--coin/platform_configs/default.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index 7dc33b49..48eec8dc 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -15,9 +15,8 @@ qtci-linux-openSUSE-42.1-x86_64 GCC
qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo
qtci-linux-RHEL-7.2-x86_64 GCC Packaging Release NoUseGoldLinker
qtci-macos-10.12-x86_64-8 Clang DebugAndRelease Release DisableTests
-qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch DisableTests
+qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch
qtci-osx-10.10-x86_64 Clang Packaging DebugAndRelease Release
-qtci-osx-10.10-x86_64 Clang DeveloperBuild Release QtNamespace NoPch
qtci-osx-10.10-x86_64 Clang Release NoFramework
qtci-osx-10.10-x86_64 IOS_ANY x86_64 Clang Release DisableTests Static
qtci-linux-RHEL-7.2-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker