From af9c1852ccc7310efff4089ae0966afbf0ceda4d Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Mon, 30 Dec 2019 18:26:26 +0000 Subject: [PATCH] Enable ISO C++ conformance mode for MSVC compiler This avoids triggering a regression in compiler version 19.24.28314 (VS 2019 16.4.2 / VS 2019 C++ component v14.24) --- mkspecs/features/common_pre.prf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/common_pre.prf b/mkspecs/features/common_pre.prf index 26ca79b7f..c6c33ca7c 100644 --- a/mkspecs/features/common_pre.prf +++ b/mkspecs/features/common_pre.prf @@ -207,10 +207,11 @@ defineTest(addLibraryDependency) { } ################################ -# Workarounds needed when using MSVC /permissive- flag +# ISO C++ conformance mode for MSVC ################################ -msvc:contains(QMAKE_CXXFLAGS, /permissive-): QMAKE_CXXFLAGS *= /FIpermissiveworkarounds.h +msvc:greaterThan(QMAKE_MSC_VER, 1923): QMAKE_CXXFLAGS *= /permissive- +msvc:contains(QMAKE_CXXFLAGS, /permissive-): QMAKE_CXXFLAGS *= /FI$${SourceRoot}\src\permissiveworkarounds.h ################################ # Experimental support for Clang on Windows