diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-01-11 16:23:30 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-01-11 16:29:06 +0100 |
| commit | 0f4fdb9490488f02342b61e8264837a7008e0687 (patch) | |
| tree | 653aaaef2c9415c81df266608b5c9f4f7bf60eb0 /coin/platform_configs | |
| parent | 15e1dc2054bd96e64f7e5ac13ac76da22e637cb9 (diff) | |
| parent | 3035f20934121effa6dd3476d6f884e81c689180 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
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.7 branch.
This is done within the same change as the merge to preserve atomicity.
Task-number: QTQAINFRA-1074
Change-Id: Ie7bde30bd64d439cd17ea789102550ab9fb44194
Diffstat (limited to 'coin/platform_configs')
| -rw-r--r-- | coin/platform_configs/default.txt | 24 | ||||
| -rw-r--r-- | coin/platform_configs/qt5.txt | 20 |
2 files changed, 44 insertions, 0 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt new file mode 100644 index 00000000..c188c794 --- /dev/null +++ b/coin/platform_configs/default.txt @@ -0,0 +1,24 @@ +Template Target OS Target arch Compiler Features +----------------------------------- ------------------- --------------- ----------- ----------------------------------------------------------------- +qtci-windows-8-x86_64 MSVC2013 DeveloperBuild Release BuildExamples +qtci-windows-10-x86_64 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix +qtci-windows-8-x86 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-8-x86_64 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-7-x86 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-10-x86 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-10-x86_64 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-8-x86_64 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests +qtci-windows-8-x86_64 WinRT_8_1 MSVC2013 Packaging DebugAndRelease Release DisableTests +qtci-linux-Ubuntu-14.04-x86_64 GCC NoWidgets ForceDebugInfo +qtci-linux-Ubuntu-14.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace +qtci-linux-OpenSuSE-13.01-x86_64 GCC DeveloperBuild NoPch +qtci-linux-RHEL-6.6-x86_64 GCC Packaging Release NoUseGoldLinker +qtci-osx-10.10-x86_64 Clang Packaging DebugAndRelease Release +qtci-osx-10.9-x86_64 Clang DeveloperBuild Release QtNamespace NoPch +qtci-osx-10.8-x86_64 Clang Release NoFramework +qtci-linux-RHEL-6.6-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-Ubuntu-14.04-x86_64 Boot2Qt_Jethro armv7 GCC DisableTests +qtci-linux-Ubuntu-15.04-x86_64 UbuntuTouch_15_04 armv7 GCC Packaging DisableTests OpenGLES2 +qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-Ubuntu-14.04-x86_64 GCC TestOnly LicenseCheck +qtci-osx-10.10-x86_64 IOS_ANY x86_64 Clang Release DisableTests Static diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt new file mode 100644 index 00000000..115b862d --- /dev/null +++ b/coin/platform_configs/qt5.txt @@ -0,0 +1,20 @@ +Template Target OS Target arch Compiler Features +--------------------------- ------------------- ----------- ----------- ----------------------------------------------------------------- +qtci-windows-8-x86_64 Windows_Phone_8_1 x86 MSVC2013 Packaging DebugAndRelease Release DisableTests +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 + +# 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 + +# qtci-osx-10.8-x86_64 Clang Release NoFramework +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-osx-10.10-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static |