From 5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Tue, 6 Jun 2017 09:43:13 +0200 Subject: Remove -permissive- flag from MSVC 2017 build The flag makes the build fail for UWP as well as desktop Windows . It will trigger a compile error as soon as UWP API is used, which happens in qtbase for desktop in the direct2d backend, but it is also used for other Qt modules, so we decided to disable the flag for now. This patch partly reverts b7d76e533c76f7d9e9373d68f33ff9595fe8ce52 Task-number: QTBUG-61239 Change-Id: I0cc630f4c09c52f0c116f4a7b95a44c3a55e0be3 Reviewed-by: Maurice Kalinowski --- mkspecs/common/msvc-version.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'mkspecs/common/msvc-version.conf') diff --git a/mkspecs/common/msvc-version.conf b/mkspecs/common/msvc-version.conf index fdf7efc0a5..d8ec089f55 100644 --- a/mkspecs/common/msvc-version.conf +++ b/mkspecs/common/msvc-version.conf @@ -81,7 +81,10 @@ greaterThan(QMAKE_MSC_VER, 1909) { MSVC_VER = 15.0 COMPAT_MKSPEC = win32-msvc2017 QMAKE_CXXFLAGS += -Zc:referenceBinding - QMAKE_CXXFLAGS_STRICTCXX = -permissive- + # For now permissive fails as soon as UWP API comes into play. In qtbase this + # API is used in direct2d, but also in multimedia, positioning and sensors. + # We can try again with a later version of Visual Studio. + # QMAKE_CXXFLAGS_STRICTCXX = -permissive- } greaterThan(QMAKE_MSC_VER, 1910) { -- cgit v1.2.3