From bd7051912f1f75d89bb2a0ddd35987d71be1f2c6 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Fri, 12 Oct 2018 15:18:03 +0200
Subject: Re-enable building on the MSVC2017 bot
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ic95e4656798810da778d6b7a618c475cc7f1258c
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
---
 mkspecs/features/platform.prf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf
index 341f7d457..35eb6b89c 100644
--- a/mkspecs/features/platform.prf
+++ b/mkspecs/features/platform.prf
@@ -62,7 +62,8 @@ defineTest(isPlatformSupported) {
     return(false)
   }
 
-  !contains(QT_CONFIG, c++14) {
+  # QMAKE doesn't set c++14 for MSVC2017, so only test for gcc and clang (which pretends to be gcc)
+  gcc:!contains(QT_CONFIG, c++14) {
     skipBuild("C++14 support is required in order to build chromium.")
     return(false)
   }
-- 
cgit v1.2.3