diff options
| author | Simo Fält <simo.falt@qt.io> | 2017-08-18 12:32:37 +0300 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-17 09:45:05 +0000 |
| commit | 6d2929d1aaa97454619725211eee4ff65c54b95e (patch) | |
| tree | 56618ccb7e63e9ce8a3dc086990bbeac0c6b71e2 /coin/platform_configs/qt5.txt | |
| parent | ea0825abe8aadf927376f25620c2e6053470a4ee (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>
(cherry picked from commit 5a040ca46a46a3a45fa61036ca5115c4d0819034)
Diffstat (limited to 'coin/platform_configs/qt5.txt')
| -rw-r--r-- | coin/platform_configs/qt5.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 5a189f25..3de18a74 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 |