Merge remote-tracking branch 'origin/dev' into 5.11

Change-Id: I3354e454e9b8c686e5d696562096a793e4a0b284
zwjkim · Feb 6, 2018 · 3279652 · 3279652
2 parents 0e4931a + 704b238
commit 3279652
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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
@@ -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