aboutsummaryrefslogtreecommitdiffstats
path: root/coin/platform_configs/qt5.txt
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2017-04-19 12:23:20 +0300
committerHeikki Halmet <heikki.halmet@qt.io>2017-04-24 05:17:04 +0000
commit370fdfcefdee8b5f4103caeb199272b3b0b957a2 (patch)
tree5ab4d2b73a6b6dc34130e0264b010581b709d51c /coin/platform_configs/qt5.txt
parent3ea073ada141164ed2999c142439fe86a220615e (diff)
Provisioning: MSVC 2017 Build Tools
MSVC 2017 build tools are pre-provisioned to windows 10 templates Change-Id: I98d857101ad209acd6eea9f821e367e514359d8c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'coin/platform_configs/qt5.txt')
-rw-r--r--coin/platform_configs/qt5.txt6
1 files changed, 3 insertions, 3 deletions
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