diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-01-12 22:12:18 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-12 22:19:30 +0100 |
| commit | 9de5f6957ce9ed1e9d1216dadc755f07783a3870 (patch) | |
| tree | 3dce81ad23ab57406ad294d2aba8fa86d33f4ecf /coin/platform_configs/qt5.txt | |
| parent | 7b17d411f17bd3309673a2855e1c08bd791bf897 (diff) | |
| parent | 0f4fdb9490488f02342b61e8264837a7008e0687 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
This change also includes an update of the CI platform configurations to
the values that were previously in the CI source tree for builds of the
5.8 branch.
This is done within the same change as the merge to preserve atomicity.
Task-number: QTQAINFRA-1074
Change-Id: Iac469c44048721530380ab577c6dbf1a6fa28211
Diffstat (limited to 'coin/platform_configs/qt5.txt')
| -rw-r--r-- | coin/platform_configs/qt5.txt | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt new file mode 100644 index 00000000..797d62cd --- /dev/null +++ b/coin/platform_configs/qt5.txt @@ -0,0 +1,17 @@ +Template Target OS Target arch Compiler Features +--------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- +qtci-windows-10-x86_64 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-linux-RHEL-6.6-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-windows-7-x86 Android_ANY armv7 Mingw49 Packaging Release DisableTests OpenGLES2 +qtci-windows-7-x86 Android_ANY x86 Mingw49 Packaging Release DisableTests OpenGLES2 +qtci-osx-10.10-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 +qtci-osx-10.10-x86_64 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-windows-7-x86 QNX_660 armv7 Mingw49 Packaging Release DisableTests OpenGLES2 +qtci-windows-7-x86 QNX_660 x86 Mingw49 Packaging Release DisableTests OpenGLES2 +qtci-windows-8-x86_64 Windows_Phone_8_1 x86 MSVC2013 Packaging DebugAndRelease Release DisableTests +qtci-osx-10.10-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static + +# target arch is used here only for documentation the value is ignored +qtci-windows-10-x86_64 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests |