diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-23 07:59:29 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-23 08:02:11 +0100 |
| commit | 85eb7b7a03ff0dab3b68f11a341e060eb066940a (patch) | |
| tree | e6607708f35431f131df9dc8ba7ac42cdaf3dd71 /coin/platform_configs/default.txt | |
| parent | 390a373f28e5c3cdcb87f4af74976d5b5cba72b2 (diff) | |
| parent | 47d14b365ed7ee6b174d48c9cb14d72c66c26d71 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
coin/platform_configs/default.txt
Change-Id: Ie21baa51738ce0761fb45fba3819b1894cc808b6
Diffstat (limited to 'coin/platform_configs/default.txt')
| -rw-r--r-- | coin/platform_configs/default.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index c88d018b..baf7fc9a 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -11,9 +11,10 @@ qtci-linux-Ubuntu-18.04-x86_64 GCC qtci-linux-Ubuntu-18.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation qtci-linux-openSUSE-15.0-x86_64 GCC DeveloperBuild NoPch qtci-linux-openSUSE-15.0-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite +qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC Packaging DeveloperBuild NoPch DisableTests qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo qtci-macos-10.13-x86_64-2 Clang Packaging DebugAndRelease Release -qtci-macos-10.12-x86_64-8 Clang DeveloperBuild NoFramework Release QtNamespace NoPch +qtci-macos-10.12-x86_64-9 Clang DeveloperBuild NoFramework Release QtNamespace NoPch qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang DebugAndRelease DisableTests qtci-macos-10.13-x86_64-2 WatchOS_ANY multi Clang DebugAndRelease DisableTests |