diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-12 15:18:03 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-12 14:09:09 +0000 |
commit | bd7051912f1f75d89bb2a0ddd35987d71be1f2c6 (patch) | |
tree | d1cbe0c80f81c46b7ca0d70d09ab4e01d001286b /mkspecs | |
parent | 5f3190f575bd33f67a3bbd8936fa364cf651cd6f (diff) |
Re-enable building on the MSVC2017 bot
Change-Id: Ic95e4656798810da778d6b7a618c475cc7f1258c
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/features/platform.prf | 3 |
1 files changed, 2 insertions, 1 deletions
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) } |