aboutsummaryrefslogtreecommitdiffstats
path: root/coin/platform_configs/default.txt
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-01-06 09:08:20 +0100
committerLiang Qi <liang.qi@qt.io>2018-01-06 09:08:20 +0100
commit2a39f8e5fe113cf96b3b11848ead1bf4011f1966 (patch)
tree49b1305970567c66026a0531300f195ee55eeacd /coin/platform_configs/default.txt
parentd3c2de907d299481c942f96ab84c627761dbb446 (diff)
parent89d4dec81886a5e2d1e7537195f8677146666c85 (diff)
Merge remote-tracking branch 'origin/5.9' into 5.10
Diffstat (limited to 'coin/platform_configs/default.txt')
-rw-r--r--coin/platform_configs/default.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index a6da2911..f1634e28 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -7,8 +7,8 @@ qtci-windows-10-x86_64-10 x86 MSVC2015
qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-linux-Ubuntu-16.04-x86_64-1 GCC NoWidgets ForceDebugInfo
-qtci-linux-Ubuntu-16.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation
+qtci-linux-Ubuntu-16.04-x86_64-2 GCC NoWidgets ForceDebugInfo
+qtci-linux-Ubuntu-16.04-x86_64-2 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation
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-6.6-x86_64 GCC Release ForceDebugInfo
@@ -20,8 +20,8 @@ qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang
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
-qtci-linux-Ubuntu-16.04-x86_64-1 GCC TestOnly LicenseCheck
+qtci-linux-Ubuntu-16.04-x86_64-2 QEMU armv7 GCC Release
+qtci-linux-Ubuntu-16.04-x86_64-2 QEMU arm64 GCC Release
+qtci-linux-Ubuntu-16.04-x86_64-2 GCC TestOnly LicenseCheck
qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker