diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-12-22 21:37:24 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-12-22 21:37:24 +0100 |
| commit | 1bba397539edbfb6a4212fe0cafbeb4ca703666a (patch) | |
| tree | a2cdfde9c0132d6ad68ba32d5fe46ef7a91343f2 /coin/platform_configs | |
| parent | a4adb7f7d66fed4b633bac15df8f9651503288ef (diff) | |
| parent | de0d7005ccff69ef1ea4c3ad42a2bf4033e26429 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh
Change-Id: I5aaf8fa93f7a9f06e30b9730703e8d1e018cb1f7
Diffstat (limited to 'coin/platform_configs')
| -rw-r--r-- | coin/platform_configs/default.txt | 2 | ||||
| -rw-r--r-- | coin/platform_configs/qt5.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 465543cb..e70e80ab 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -22,4 +22,4 @@ qtci-linux-Ubuntu-16.04-x86_64-1 QEMU armv7 GCC qtci-linux-Ubuntu-16.04-x86_64-1 QEMU arm64 GCC Release qtci-linux-Ubuntu-16.04-x86_64-1 GCC TestOnly LicenseCheck qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 15c0a761..3a3af1fe 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,9 +1,9 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-8.1-x86_64 x86 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests +qtci-windows-8.1-x86_64 x86 MSVC2013 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86-6 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 MSVC2017 Packaging 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 |