diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-07-02 13:12:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-07-02 13:12:35 +0200 |
| commit | c6d9e433dfa899890b4279c773779659f8cb2626 (patch) | |
| tree | 1335a5742b5c6eed239f26e616fdad30e1af6271 /coin/platform_configs | |
| parent | 7784f89036afca51292ab0cc3aadff59b3004f5f (diff) | |
| parent | 3e044c71b92617eb8eb794edd30d94f57d9524ac (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh
Change-Id: I00d0ccd138eb8d89e30e7e57632c6fc8f83e0001
Diffstat (limited to 'coin/platform_configs')
| -rw-r--r-- | coin/platform_configs/qt5.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index ae1f98ae..72ec9b61 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -4,6 +4,7 @@ qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packagin qtci-windows-10-x86_64-10 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests +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 |