diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-27 10:26:38 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-27 10:26:38 +0200 |
| commit | 1cfc052b9dfac1caf233c96adc1ffe766ad03a00 (patch) | |
| tree | acd56923189e6e7b0998185f3d05009361187e74 /coin/platform_configs/qt5.txt | |
| parent | 36d633f2fd4bfefb1c040a7c68436571b8e07d0c (diff) | |
| parent | 0e4d668e358eb6a025b3173e8a822ddbef7f5aa7 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
coin/platform_configs/qt5.txt
coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh
Change-Id: I16388eb0c2ebaa08e7bb1255711d64647fdad3ac
Diffstat (limited to 'coin/platform_configs/qt5.txt')
| -rw-r--r-- | coin/platform_configs/qt5.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index fba05914..23858e68 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -17,6 +17,9 @@ qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packagin qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.2-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.2-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-osx-10.10-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static +qtci-windows-10-x86_64-7 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-7 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 +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 qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang DebugAndRelease DisableTests +qtci-linux-RHEL-7.2-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker |