aboutsummaryrefslogtreecommitdiffstats
path: root/coin/platform_configs
diff options
context:
space:
mode:
Diffstat (limited to 'coin/platform_configs')
-rw-r--r--coin/platform_configs/default.txt4
-rw-r--r--coin/platform_configs/qt5.txt6
2 files changed, 5 insertions, 5 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index ae173eb7..917a8323 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -6,8 +6,8 @@ qtci-windows-8-x86-2 MSVC2013
qtci-windows-8-x86_64-2 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic
qtci-windows-7-x86-2 MSVC2010 Release DeveloperBuild QtNamespace QtLibInfix OpenGLDynamic
qtci-windows-7-x86-2 Mingw49 Packaging DebugAndRelease Release OpenGLDynamic
-qtci-windows-10-x86-4 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic
-qtci-windows-10-x86_64-5 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic
+qtci-windows-10-x86-5 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic
+qtci-windows-10-x86_64-6 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic
qtci-windows-8-x86_64-2 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests
qtci-windows-8-x86_64-2 WinRT_8_1 MSVC2013 Packaging DebugAndRelease Release DisableTests
qtci-linux-Ubuntu-14.04-x86_64 GCC NoWidgets ForceDebugInfo
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt
index 0494e964..77e98693 100644
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -1,8 +1,8 @@
Template Target OS Target arch Compiler Features
--------------------------- ------------------- ----------- ----------- -----------------------------------------------------------------------------------------------
qtci-windows-8-x86_64-2 Windows_Phone_8_1 x86 MSVC2013 Packaging DebugAndRelease Release DisableTests
-qtci-windows-10-x86_64-5 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests
-qtci-windows-10-x86_64-5 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests
+qtci-windows-10-x86_64-6 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests
+qtci-windows-10-x86_64-6 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests
qtci-linux-RHEL-6.6-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-windows-7-x86-2 Android_ANY armv7 Mingw49 Packaging Release DisableTests OpenGLES2
qtci-windows-7-x86-2 Android_ANY x86 Mingw49 Packaging Release DisableTests OpenGLES2
@@ -12,6 +12,6 @@ qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packagin
qtci-windows-7-x86-2 QNX_660 armv7 Mingw49 Packaging Release DisableTests OpenGLES2
qtci-windows-7-x86-2 QNX_660 x86 Mingw49 Packaging Release DisableTests OpenGLES2
# target arch is used here only for documentation the value is ignored
-qtci-windows-10-x86_64-5 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests
+qtci-windows-10-x86_64-6 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests
qtci-osx-10.11-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static