diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-12-11 12:11:51 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-12-11 12:11:51 +0100 |
| commit | eccfaf1f506ceb46016e385c1a2707461811def2 (patch) | |
| tree | 60170d99a86a86b07ff30b398ad0b72869495f1e /coin/platform_configs | |
| parent | c2c45640e0bc40fb9ac3a8175325a76de2c0b496 (diff) | |
| parent | 91df8a3a8f313dd9914ba9bd221ac6cdbf497f99 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Ica3e7340f572140020318c6e22397fad393f9b15
Diffstat (limited to 'coin/platform_configs')
| -rw-r--r-- | coin/platform_configs/qtbase.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/platform_configs/qtbase.txt b/coin/platform_configs/qtbase.txt index 45810bce..3292cc6e 100644 --- a/coin/platform_configs/qtbase.txt +++ b/coin/platform_configs/qtbase.txt @@ -1,4 +1,4 @@ Template Target OS Target arch Compiler Features --------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-16.04-x86_64-1 QEMU armv7 GCC DeveloperBuild, DisableTests -qtci-linux-Ubuntu-16.04-x86_64-1 QEMU arm64 GCC DeveloperBuild, DisableTests +qtci-linux-Ubuntu-16.04-x86_64-1 QEMU armv7 GCC DeveloperBuild DisableTests +qtci-linux-Ubuntu-16.04-x86_64-1 QEMU arm64 GCC DeveloperBuild DisableTests |