aboutsummaryrefslogtreecommitdiffstats
path: root/coin/platform_configs/default.txt
diff options
context:
space:
mode:
authorJoni Jäntti <joni.jantti@qt.io>2017-10-19 15:53:34 +0300
committerJoni Jäntti <joni.jantti@qt.io>2017-10-23 17:37:10 +0000
commit3b7b924b31f28c38068e99d4637a90e34362a685 (patch)
treec54b7fbb9b2de6908731894f2cc651edccac938a /coin/platform_configs/default.txt
parentf129af9f8139c2c8b4276e550f0696cef56b9b16 (diff)
Fix Windows 10 x64 Python with new tier 1
Current tier 1 template #9 has python and anaconda installed that came with MSVC2017. This messes with the provisioning scripts and ultimately builds such as pyside, even though qt5 builds go through. Task-number: QTQAINFRA-1503 Change-Id: Id4e1303ba2524373170f1aca7b0c7e66f9f235dc Reviewed-by: Heikki Halmet <heikki.halmet@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 b8b8934d..ea31b802 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -1,12 +1,12 @@
Template Target OS Target arch Compiler Features
----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-windows-8.1-x86_64 MSVC2013 DeveloperBuild Release DisableTests
-qtci-windows-10-x86_64-9 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
+qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
qtci-windows-7-x86-2 Mingw53 DeveloperBuild Release OpenGLDynamic
-qtci-windows-10-x86_64-9 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-9 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-9 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-9 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+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-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch