diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-12-20 08:25:46 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-12-21 16:55:12 +0000 |
| commit | 730e2c9b0b602abd1a1ff45c9ca0e6ec363e7802 (patch) | |
| tree | bfe9707dbcdf8b59ea2ed225fd4e39f0b00dde1b | |
| parent | 5df4ec2ec999440ba291f2bf2f9fa6b72810660d (diff) | |
Revert "Temporarily disable android build on macOS 10.12"
Bring android build on macOS back.
This reverts commit b6249e89fad8c31a1ae4b6be4b8342cc5d9f947d.
Task-number: QTQAINFRA-1660
Change-Id: I510894cf6bdc7089fea140e3702e5246a6617787
Reviewed-by: Liang Qi <liang.qi@qt.io>
| -rw-r--r-- | coin/platform_configs/qt5.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 6797406c..38dbd1c1 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -12,6 +12,8 @@ qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packagin qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC 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-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-macos-10.12-x86_64-8 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static |