diff options
author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-22 12:19:10 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-22 12:19:10 +0100 |
commit | 052b4b5844dc793199c4d4bb6357cc656dd919b1 (patch) | |
tree | 9d4e4363f7d69dee8f2ec01e7046f67ed5907ca8 /coin/platform_configs/default.txt | |
parent | dc1560dbef6715d8a22e1bee67a418c9fb0a5b81 (diff) | |
parent | b6a1e9f07e0a891cc3435f535bf01f5df8f52de8 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I1031266ae727e7bfeae71bf3faed9b5197c16247
Diffstat (limited to 'coin/platform_configs/default.txt')
-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 73e668b4..31a71e98 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -11,7 +11,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 |