diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-06 09:46:18 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-06 10:19:35 +0200 |
| commit | dd3d32d13cf03a9e6ca661408b7995e8493c6af4 (patch) | |
| tree | 019a40a309750b92dcc28ab2bccb76d1b574eddf /coin/platform_configs/qtdeclarative.txt | |
| parent | cc8a7501f329fbfefd1584f18ac7ff413e2d0854 (diff) | |
| parent | 88525879919a3aa36d1753e8d4348201f2a44046 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qtdeclarative.txt
coin/provisioning/common/InstallPKGFromURL.sh
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh
Change-Id: Id174b48e650ed18fbba48b4fc617ee075b0586ec
Diffstat (limited to 'coin/platform_configs/qtdeclarative.txt')
| -rw-r--r-- | coin/platform_configs/qtdeclarative.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt index b9d5ecb0..aa718d0c 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_Pyro x86_64 GCC DeveloperBuild +qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Pyro armv7 GCC DeveloperBuild |