diff options
| author | Simo Fält <simo.falt@qt.io> | 2018-10-18 09:47:08 +0300 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-25 12:35:07 +0000 |
| commit | d65d71731f8b50ee8912134e81418178a0a158a7 (patch) | |
| tree | 1f3c00f54214b9eda78e3aff727f6ba9a209a21f /coin | |
| parent | 41b0fbb4624e999814c9068f7cffcc44f131be06 (diff) | |
CI platform config: Make 32 bit msvc2017 config as default
Swapping 32 bit windows packaging configs so that MSVC 2017 is
built as default config and MSVC 2015 only for qt5.
As the config is not part of the default.txt we have to add it as
module specific config.
Change-Id: I3c423c2c80d0093fdeca340d6faa8e162c03b5cd
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/platform_configs/default.txt | 2 | ||||
| -rw-r--r-- | coin/platform_configs/qt3d-runtime.txt | 2 | ||||
| -rw-r--r-- | coin/platform_configs/qt5.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 8c90b80c..8878836c 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -2,7 +2,7 @@ Template Target OS Target arch Compiler ----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples qtci-windows-7-x86-3 Mingw73 DeveloperBuild Release OpenGLDynamic -qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-10 x86 MSVC2017 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 diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt index 6abc5ed2..fdc51d6b 100644 --- a/coin/platform_configs/qt3d-runtime.txt +++ b/coin/platform_configs/qt3d-runtime.txt @@ -1,7 +1,7 @@ Template Target OS Target arch Compiler Target Compiler Features --------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 37065eff..5a189f25 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,7 +1,7 @@ Template Target OS Target arch Compiler Target Compiler Features --------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests |