diff options
author | Liang Qi <liang.qi@qt.io> | 2018-02-06 17:47:33 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-02-06 17:49:39 +0100 |
commit | 32796526351787cf5176a005d1ac2df2e876517f (patch) | |
tree | 8bca97bc62b7ec49c21cf5658583da739b6d817c /coin | |
parent | 0e4931a8afa3e0a96df4a01b056ec82a274b7e45 (diff) | |
parent | 704b2387de408f4d869baf4f72cedc80999af842 (diff) |
Merge remote-tracking branch 'origin/dev' into 5.11
Change-Id: I3354e454e9b8c686e5d696562096a793e4a0b284
Diffstat (limited to 'coin')
-rw-r--r-- | coin/platform_configs/default.txt | 1 | ||||
-rw-r--r-- | coin/platform_configs/qt5.txt | 1 | ||||
-rw-r--r-- | coin/platform_configs/qtwebkit.txt | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 31a71e98..66193fbc 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -6,6 +6,7 @@ qtci-windows-10-x86_64-10 x86 MSVC2015 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-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-linux-Ubuntu-16.04-x86_64-2 GCC NoWidgets ForceDebugInfo qtci-linux-Ubuntu-16.04-x86_64-2 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 0789b1fb..36d8f5eb 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -2,7 +2,6 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86-6 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 MSVC2017 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 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt index 75fa9c20..efae9754 100644 --- a/coin/platform_configs/qtwebkit.txt +++ b/coin/platform_configs/qtwebkit.txt @@ -1,5 +1,4 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-10-x86_64-10 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests |