diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-01-14 08:40:10 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-01-14 08:40:10 +0100 |
| commit | a34d81258006375757941480c0b8ab90073ecfb3 (patch) | |
| tree | b8b4753c8f7a14926d019e409579c84f9fd1e618 /coin/platform_configs | |
| parent | 4d206f1fb613df82768b6276b1bb317d2c85c9ad (diff) | |
| parent | 9de5f6957ce9ed1e9d1216dadc755f07783a3870 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
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
dev branch.
This is done within the same change as the merge to preserve atomicity.
Task-number: QTQAINFRA-1074
Change-Id: Ic47f7db3506ace4faca028b902d48cdb009c8495
Diffstat (limited to 'coin/platform_configs')
| -rw-r--r-- | coin/platform_configs/default.txt | 23 | ||||
| -rw-r--r-- | coin/platform_configs/qt5.txt | 12 | ||||
| -rw-r--r-- | coin/platform_configs/qtxmlpatterns.txt | 3 |
3 files changed, 38 insertions, 0 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt new file mode 100644 index 00000000..3b4e7b79 --- /dev/null +++ b/coin/platform_configs/default.txt @@ -0,0 +1,23 @@ +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-10-x86_64 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64 WinRT_10 armv7 MSVC2015 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-42.1-x86_64 GCC DeveloperBuild NoPch +qtci-linux-RHEL-6.6-x86_64 GCC Release +qtci-osx-10.10-x86_64 Clang Packaging DebugAndRelease Release +qtci-osx-10.10-x86_64 Clang DeveloperBuild Release QtNamespace NoPch +qtci-osx-10.10-x86_64 Clang Release NoFramework +qtci-osx-10.10-x86_64 IOS_ANY x86_64 Clang Release DisableTests Static +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-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-Ubuntu-14.04-x86_64 GCC TestOnly LicenseCheck diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt new file mode 100644 index 00000000..9429c5bd --- /dev/null +++ b/coin/platform_configs/qt5.txt @@ -0,0 +1,12 @@ +Template Target OS Target arch Compiler Features +--------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- +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 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-7-x86 Android_ANY x86 Mingw53 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 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-7-x86 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-osx-10.10-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static diff --git a/coin/platform_configs/qtxmlpatterns.txt b/coin/platform_configs/qtxmlpatterns.txt new file mode 100644 index 00000000..b57c0abc --- /dev/null +++ b/coin/platform_configs/qtxmlpatterns.txt @@ -0,0 +1,3 @@ +Template Target OS Target arch Compiler Features +------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- +qtci-linux-openSUSE-42.1-x86_64 GCC DeveloperBuild NoPch |