diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-19 09:56:46 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-19 09:56:46 +0100 |
commit | 45528e68740a225cd3cb9dc116aca2c2b452bd23 (patch) | |
tree | f87e247e7ea71d3afe691a8a2999248979d8f1e1 /coin/platform_configs | |
parent | 21e734438986ab73647d966a1058959c002e760c (diff) | |
parent | 786be66eaf2bf35c75ca534930cbc87c52634e8d (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I0fdced87d2064e8459fa0b9c4e16a53c1f44ac0a
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 f1634e28..5553d7b8 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -12,7 +12,7 @@ qtci-linux-Ubuntu-16.04-x86_64-2 GCC qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo -qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo +qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker 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 |