diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2017-01-26 12:07:30 +0200 |
|---|---|---|
| committer | Heikki Halmet <heikki.halmet@qt.io> | 2017-02-06 12:07:46 +0000 |
| commit | c8372d36413ae2e8c854f9bf742ed29eb4b060c6 (patch) | |
| tree | b624b6ebe560ba39ce4b70be743531e34801bfdf /coin/platform_configs | |
| parent | b071c82d198dd4ec9f411899f17a4578f0352e4e (diff) | |
Linux android builds to RHEL 7.2
In 5.9 android builds will be using
RHEL 7.2 instead of 6.6
Task-number: QTQAINFRA-1096
Change-Id: Ia802aa31fe347616c829e2142991686fe8e95ed9
Reviewed-by: Simon Hausmann <simon.hausmann@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 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index be44f77f..40633b0f 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -18,7 +18,7 @@ qtci-osx-10.10-x86_64 Clang qtci-osx-10.10-x86_64 Clang DeveloperBuild Release QtNamespace NoPch qtci-osx-10.10-x86_64 Clang Release NoFramework qtci-osx-10.10-x86_64 IOS_ANY x86_64 Clang Release DisableTests Static -qtci-linux-RHEL-6.6-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.2-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-14.04-x86_64 Boot2Qt_Jethro armv7 GCC DisableTests qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-14.04-x86_64 GCC TestOnly LicenseCheck diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 9429c5bd..76f57f9f 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,7 +1,7 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-10-x86_64 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests -qtci-linux-RHEL-6.6-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.2-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-osx-10.10-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 |