diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-08-30 09:50:50 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-08-30 09:50:50 +0200 |
| commit | 1b65a5d73a8e3a411093f4c0f1f4803eb2d08e54 (patch) | |
| tree | 3669e803153df25221aaeaa81500711fb7ba4fab /coin/platform_configs | |
| parent | e89420945f368ec7b6d03b8aeb6e6b478ee960fe (diff) | |
| parent | 5a2a93ddf48465f37c116ef93f66682d789a61fc (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Change-Id: Iaae974fbfad9130ead96d229829ab472c998e098
Diffstat (limited to 'coin/platform_configs')
| -rw-r--r-- | coin/platform_configs/default.txt | 6 | ||||
| -rw-r--r-- | coin/platform_configs/qt5.txt | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 7ac4037a..b0e9e210 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -17,9 +17,9 @@ qtci-macos-10.12-x86_64-8 Clang qtci-macos-10.13-x86_64 Clang DebugAndRelease Release qtci-macos-10.12-x86_64-8 Clang DeveloperBuild Release QtNamespace NoPch qtci-macos-10.12-x86_64-8 Clang Release NoFramework DisableTests -qtci-macos-10.13-x86_64 IOS_ANY multi Clang Release DisableTests Static -qtci-macos-10.13-x86_64 TvOS_ANY multi Clang Release DisableTests -qtci-macos-10.13-x86_64 WatchOS_ANY multi Clang Release DisableTests +qtci-macos-10.13-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static +qtci-macos-10.13-x86_64 TvOS_ANY multi Clang DebugAndRelease DisableTests +qtci-macos-10.13-x86_64 WatchOS_ANY multi Clang DebugAndRelease DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC Release qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC Release diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 980b1323..f9979818 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -13,9 +13,6 @@ qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Packagin 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.13-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static -qtci-macos-10.13-x86_64 TvOS_ANY multi Clang DebugAndRelease DisableTests -qtci-macos-10.13-x86_64 WatchOS_ANY multi Clang DebugAndRelease DisableTests qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 |