aboutsummaryrefslogtreecommitdiffstats
path: root/coin/platform_configs/default.txt
diff options
context:
space:
mode:
authorJoni Jäntti <joni.jantti@qt.io>2017-06-29 13:46:35 +0300
committerSimon Hausmann <simon.hausmann@qt.io>2017-08-11 16:49:10 +0000
commitbd3ddeddd256557a8b0820f0958b630347344c25 (patch)
tree8cde468970f09f6e3dfd432057a83be5ea3fbcb1 /coin/platform_configs/default.txt
parent043e54c7c6de5ae262731ab48e8960c66d4cc89f (diff)
Make CI use a new win 8.1 provisioning instead of win 8
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 8 template. Made all the Windows platforms use the scripts under provisioning/common/ instead of duplicate files. Task-number: QTQAINFRA-1357 Change-Id: Ic3f0b50079b212437fff711379f243753ab84872 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
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 b1e90fc4..57820fcc 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -1,17 +1,17 @@
Template Target OS Target arch Compiler Features
----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-windows-8-x86_64-2 MSVC2013 DeveloperBuild Release BuildExamples
-qtci-windows-8-x86_64-2 MSVC2012 DeveloperBuild Release QtNamespace QtLibInfix
+qtci-windows-8.1-x86_64 MSVC2013 DeveloperBuild Release BuildExamples
+qtci-windows-8.1-x86_64 MSVC2012 DeveloperBuild Release QtNamespace QtLibInfix
qtci-windows-8-x86-2 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic
-qtci-windows-8-x86_64-2 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic
+qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic
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-8-x86_64-2 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests
-qtci-windows-8-x86_64-2 WinRT_8_1 MSVC2013 Packaging DebugAndRelease Release DisableTests
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
+qtci-windows-8.1-x86_64 WinRT_8_1 MSVC2013 Packaging DebugAndRelease Release DisableTests
qtci-linux-OpenSuSE-13.01-x86_64 GCC DeveloperBuild NoPch
qtci-linux-RHEL-6.6-x86_64 GCC Packaging Release NoUseGoldLinker
qtci-osx-10.11-x86_64 Clang Packaging DebugAndRelease Release