aboutsummaryrefslogtreecommitdiffstats
path: root/coin/platform_configs
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@petroules.com>2018-01-01 22:00:01 -0800
committerJake Petroules <jake.petroules@qt.io>2018-01-05 04:15:19 +0000
commitd3c2de907d299481c942f96ab84c627761dbb446 (patch)
tree08ee020550258a83edc34022937085ace996dde2 /coin/platform_configs
parent1bba397539edbfb6a4212fe0cafbeb4ca703666a (diff)
Add Apple tvOS and Apple watchOS configs for all modules
...not just qt5. This will eliminate the semi-frequent integration failures in qt5 submodules updates. Change-Id: I99a4eb1cf41005adcfd12e385b663a5d8adbc628 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Diffstat (limited to 'coin/platform_configs')
-rw-r--r--coin/platform_configs/default.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index e70e80ab..a6da2911 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -16,7 +16,9 @@ qtci-linux-RHEL-7.4-x86_64 GCC
qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release
qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch
qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests
-qtci-macos-10.12-x86_64-8 IOS_ANY x86_64 Clang Release DisableTests Static
+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-linux-RHEL-7.4-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-Ubuntu-16.04-x86_64-1 QEMU armv7 GCC Release
qtci-linux-Ubuntu-16.04-x86_64-1 QEMU arm64 GCC Release