diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-18 13:48:39 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-18 13:51:35 +0200 |
| commit | 356b20feed27e97fa71db5ba8c11c9343e6b26cc (patch) | |
| tree | e368c6a15c41c4d87aad36f09174b1bd70ef816f /coin/platform_configs | |
| parent | f02c2e2fdeb3777a065f0d0a7d3c486efc648c87 (diff) | |
| parent | 6dd41c84067a213fa98d9b59aed2601a982bf665 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh
Change-Id: Icf3d05fa71052b411febe58c287b9a5b014a275f
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 468451e9..9150d782 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -8,7 +8,7 @@ qtci-windows-10-x86_64-7 MSVC2015 qtci-windows-10-x86_64-7 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-7 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-Ubuntu-16.04-x86_64-1 GCC NoWidgets ForceDebugInfo -qtci-linux-Ubuntu-16.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace Documentation +qtci-linux-Ubuntu-16.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo qtci-linux-RHEL-7.2-x86_64 GCC Packaging Release NoUseGoldLinker |