diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-12-13 23:28:56 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-12-13 23:28:56 +0100 |
| commit | 475fc2c2ad53252dbc9fb1657dc2c7fe660fcd07 (patch) | |
| tree | 3c2f7e755897fcffc1d2f5d8ac1f2e7261f38b1f /coin/platform_configs | |
| parent | eccfaf1f506ceb46016e385c1a2707461811def2 (diff) | |
| parent | b16eac13e6f65f338ec9e78ce4a926edadde8efb (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.gitmodules
Change-Id: If22ccc401db60d550d6e6b474d54a05b363884af
Diffstat (limited to 'coin/platform_configs')
| -rw-r--r-- | coin/platform_configs/default.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 39f0373d..4f6920c9 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -12,7 +12,7 @@ qtci-linux-Ubuntu-16.04-x86_64-1 GCC qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo -qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests |