diff options
| author | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2017-08-25 10:11:58 +0300 |
|---|---|---|
| committer | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2017-09-05 15:15:59 +0000 |
| commit | cc8a7501f329fbfefd1584f18ac7ff413e2d0854 (patch) | |
| tree | 3723583b63e87797ca8faf7c3107b4d18ac13faa /coin | |
| parent | 87df3502a7d5f75c32eefe921a6cfbb3e6d9068a (diff) | |
Swap B2Qt branch to Pyro
Task-number: QTQAINFRA-1364
Change-Id: I55906a90e26dccd8d32e686368530f27e46e67fc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/platform_configs/default.txt | 2 | ||||
| -rw-r--r-- | coin/platform_configs/qtdeclarative.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index b3d564c5..e0467131 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -18,6 +18,6 @@ qtci-osx-10.10-x86_64 Clang qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests qtci-osx-10.10-x86_64 IOS_ANY x86_64 Clang Release DisableTests Static qtci-linux-RHEL-7.2-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Jethro armv7 GCC Release +qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Pyro armv7 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 diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt index c8ac9c47..b9d5ecb0 100644 --- a/coin/platform_configs/qtdeclarative.txt +++ b/coin/platform_configs/qtdeclarative.txt @@ -1,3 +1,3 @@ Template Target OS Target arch Compiler Features --------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Jethro x86_64 GCC DeveloperBuild +qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Pyro x86_64 GCC DeveloperBuild |