diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-01-05 07:46:06 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-01-05 07:47:26 +0200 |
| commit | 18f6169bee4d687f9aca39cede82e89dbfa95bbe (patch) | |
| tree | 470804ca5ec7d0c3368cc3e1c01aa30ff5a1d1b2 /coin/platform_configs/qtdeclarative.txt | |
| parent | a0bf828433b375c752713d6935ddb9134b2c68d3 (diff) | |
| parent | 4fb893fcf8ef55ff3ebbdf684c4d1cfab913cea0 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.9.4
This merge wasn't done during final downmerge from '5.9' -> '5.9.4'
Change-Id: I516c24ba52575634f3932ff4f40221f31ef06ee0
Diffstat (limited to 'coin/platform_configs/qtdeclarative.txt')
| -rw-r--r-- | coin/platform_configs/qtdeclarative.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt index 3139af8b..9d321d40 100644 --- a/coin/platform_configs/qtdeclarative.txt +++ b/coin/platform_configs/qtdeclarative.txt @@ -1,4 +1,4 @@ Template Target OS Target arch Compiler Features --------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-16.04-x86_64-1 QEMU armv7 GCC DeveloperBuild -qtci-linux-Ubuntu-16.04-x86_64-1 QEMU arm64 GCC DeveloperBuild +qtci-linux-Ubuntu-16.04-x86_64-2 QEMU armv7 GCC DeveloperBuild +qtci-linux-Ubuntu-16.04-x86_64-2 QEMU arm64 GCC DeveloperBuild |