diff options
author | Joni Jantti <joni.jantti@qt.io> | 2018-01-10 13:50:23 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-08-04 05:06:22 +0000 |
commit | aeb39be740d309afae2ac5adb2d5e1b8346fdb8a (patch) | |
tree | 9962f6efae572a3ec86341873d758c251fd2d833 /coin/platform_configs | |
parent | a97bea0821d59e6e251aa0518ff370a7ccd44d52 (diff) |
Upgrade Android NDK to r16b and switch to clang
We need to upgrade the Android NDK version
when we switch to building with clang.
Task-number: QTQAINFRA-1681
Change-Id: Ic43b28ead393ec5828b099727182df5f4424f419
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'coin/platform_configs')
-rw-r--r-- | coin/platform_configs/default.txt | 2 | ||||
-rw-r--r-- | coin/platform_configs/qt5.txt | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 2c8db4ac..1116680f 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -19,7 +19,7 @@ qtci-osx-10.11-x86_64-3 Clang qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Release DisableTests Static qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang Release DisableTests qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang Release DisableTests -qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-16.04-x86_64-2 QEMU armv7 GCC Release qtci-linux-Ubuntu-16.04-x86_64-2 QEMU arm64 GCC Release qtci-linux-Ubuntu-16.04-x86_64-2 GCC TestOnly LicenseCheck diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 72ec9b61..5e0e6657 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -7,11 +7,11 @@ qtci-windows-7-x86-3 Mingw53 Packagin qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests 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 Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86-3 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-3 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 -qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 +qtci-macos-10.12-x86_64-8 Android_ANY armv7 Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.12-x86_64-8 Android_ANY x86 Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang DebugAndRelease DisableTests |