aboutsummaryrefslogtreecommitdiffstats
path: root/coin/platform_configs/default.txt
diff options
context:
space:
mode:
authorJoni Jäntti <joni.jantti@qt.io>2017-05-19 14:27:35 +0300
committerJoni Jäntti <joni.jantti@qt.io>2017-09-01 08:05:54 +0000
commit30660bf987a22275339ae522c411809cdf077406 (patch)
tree44c009756225a184aa5f9ea0b2e7ef0aee753c64 /coin/platform_configs/default.txt
parenta99d3432f71c4be5045ae2cdcc3b7070de5abe23 (diff)
Make CI use a new provisioned Win 10 template
Added all the provisioning scripts that install required programs and make changes to certain settings. These are needed to build qt5. This replaces the old Windows 10 template. Task-number: QTQAINFRA-1263 Change-Id: Ieeb2ae3c53841644996d99ca86228df6f825a63a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'coin/platform_configs/default.txt')
-rw-r--r--coin/platform_configs/default.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index 57820fcc..23b6e331 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -7,7 +7,7 @@ qtci-windows-8.1-x86_64 MSVC2013
qtci-windows-7-x86-2 MSVC2010 Release DeveloperBuild QtNamespace QtLibInfix OpenGLDynamic
qtci-windows-7-x86-2 Mingw49 Packaging DebugAndRelease Release OpenGLDynamic
qtci-windows-10-x86-6 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic
-qtci-windows-10-x86_64-7 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic
+qtci-windows-10-x86_64-8 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic
qtci-linux-Ubuntu-14.04-x86_64-1 GCC NoWidgets ForceDebugInfo
qtci-linux-Ubuntu-14.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace Documentation
qtci-windows-8.1-x86_64 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests