aboutsummaryrefslogtreecommitdiffstats
path: root/coin/platform_configs
diff options
context:
space:
mode:
authorSimo Fält <simo.falt@qt.io>2017-08-18 12:32:37 +0300
committerLiang Qi <liang.qi@qt.io>2018-11-06 19:30:23 +0000
commit5a040ca46a46a3a45fa61036ca5115c4d0819034 (patch)
tree78b7cb722e79b60a1398bc9b7220fc71ee91a9a5 /coin/platform_configs
parentde05c3d5e89a79e84fa84d5f5667ec14d992fff9 (diff)
Provisioning: Move Android toolchain and config to win10
Installing Android toolchains and ssl headers to win10 template and moving Android windows platform configs to win10 from win7. Task-number: QTQAINFRA-1266 Change-Id: I9b3e3a378451e0bdfc7dc5c7b75ee035faf8994c Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Diffstat (limited to 'coin/platform_configs')
-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 37065eff..88d3cf4a 100644
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -8,9 +8,9 @@ qtci-windows-10-x86_64-10 Mingw73
qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-windows-7-x86-3 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2
-qtci-windows-7-x86-3 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2
-qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2