From 7a96b8dfd4d11e87392fcb4d07ae6ba488b0cc38 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 29 Dec 2017 17:47:10 +0100 Subject: Revert "Temporarily remove two platforms from the qt5.git build" This re-enables all platforms we should be testing on, after having resolved the deadlock between qtbase and declarative. This reverts commit 62efcd0c0abf809809aa01a3e8e3e19a7462d2c7. Change-Id: I2bcc34ad2d00036cc8ed37badbca67d4e68f5eac Reviewed-by: Lars Knoll --- coin/platform_configs/default.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 351ba5db..03057f86 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -8,8 +8,8 @@ qtci-windows-10-x86_64-10 MSVC2015 qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-10 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 BuildExamples Documentation -#qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch +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-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 -- cgit v1.2.3