diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-22 08:22:02 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-22 08:22:02 +0200 |
| commit | 74eb853384473dbe18123f9731b6f9529d68d2cf (patch) | |
| tree | af5f2be1057f4a80f331bb5d81caa0af6c35aac8 /coin/platform_configs | |
| parent | c2493f9d6dcd0bdcf028dfce9b7b8f6356fa9eea (diff) | |
| parent | 5df417aeb9fe5fa8b8613abdd3b32bc79e32f49e (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Move the Documentation feature to the corresponding Ubuntu 16.04, where
the CI would have used it by magic.
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Done-with: Frederik Gladhorn<frederik.gladhorn@qt.io>
Change-Id: I885ce572710480cd15ecdc8cfac7edb52957f92a
Diffstat (limited to 'coin/platform_configs')
| -rw-r--r-- | coin/platform_configs/default.txt | 4 | ||||
| -rw-r--r-- | coin/platform_configs/qt5.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index e2fbebd1..b3d564c5 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,6 +1,6 @@ Template Target OS Target arch Compiler Features ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-8-x86_64-2 MSVC2013 DeveloperBuild Release DisableTests +qtci-windows-8.1-x86_64 MSVC2013 DeveloperBuild Release DisableTests qtci-windows-10-x86_64-7 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples qtci-windows-7-x86-2 Mingw53 DeveloperBuild Release OpenGLDynamic qtci-windows-10-x86_64-7 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic @@ -8,7 +8,7 @@ qtci-windows-10-x86_64-7 MSVC2015 qtci-windows-10-x86_64-7 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-7 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 +qtci-linux-Ubuntu-16.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace Documentation qtci-linux-openSUSE-42.1-x86_64 GCC DeveloperBuild NoPch qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo qtci-linux-RHEL-7.2-x86_64 GCC Packaging Release NoUseGoldLinker diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 0b38af20..9008d187 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,7 +1,7 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-8-x86-2 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-8-x86_64-2 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests +qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-10-x86_64-7 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic |