diff options
author | Liang Qi <liang.qi@qt.io> | 2017-12-14 11:49:07 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-12-14 11:49:07 +0100 |
commit | def11da274cc4af1ba15bdc43fe7aac74bb40d49 (patch) | |
tree | 65523361f6e2371f135abb0c0b7c40a9f808b05f /coin/platform_configs/qtbase.txt | |
parent | 44eaaf374a2c4cc0e370f84c561a7aaaa23f4096 (diff) | |
parent | eccfaf1f506ceb46016e385c1a2707461811def2 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
coin/platform_configs/qt5.txt
Change-Id: I9ad5a004544bf2f368ee1aaad247c4db3b36b162
Diffstat (limited to 'coin/platform_configs/qtbase.txt')
-rw-r--r-- | coin/platform_configs/qtbase.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/coin/platform_configs/qtbase.txt b/coin/platform_configs/qtbase.txt new file mode 100644 index 00000000..3292cc6e --- /dev/null +++ b/coin/platform_configs/qtbase.txt @@ -0,0 +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 |