diff options
author | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2017-08-14 13:39:37 +0300 |
---|---|---|
committer | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2017-09-02 05:47:47 +0000 |
commit | d1dfb5767f1f199937abe5c46aba5219d667b21d (patch) | |
tree | a16313c6fbc2a8506bc7915a146cb50a7ac8aa73 | |
parent | 6bf5691ca87dd4dcf9386a4c6320be2c39db6dcb (diff) |
Swap B2Qt branch to Morty
Task-number: QTQAINFRA-1364
Change-Id: I9b114d2cbea60928fac4aa8dec9721099b92f5f6
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
-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..b444d157 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_Morty 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 1cc88584..2a9d9ac7 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 armv7 GCC DeveloperBuild +qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Morty armv7 GCC DeveloperBuild |