From 9d7af08f3de19e6753f9b478e8647f2e0ab2f6fc Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Sat, 1 Dec 2018 17:40:18 +0000 Subject: [PATCH] Removed workarounds no longer needed. --- mkspecs/features/common_pre.prf | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/mkspecs/features/common_pre.prf b/mkspecs/features/common_pre.prf index 5164d05ad..5664cf9f6 100644 --- a/mkspecs/features/common_pre.prf +++ b/mkspecs/features/common_pre.prf @@ -186,16 +186,6 @@ msvc:contains(QMAKE_CXXFLAGS, /permissive-): QMAKE_CXXFLAGS *= /FIpermissivework ################################ clang_cl { - QMAKE_CXXFLAGS ~= s/-fms-compatibility-version=.+/ - QMAKE_CXXFLAGS += -fms-compatibility-version=19.00.24210 - - # QtCreator ships with a version of clang-cl, - # but we want to use the one in PATH instead. - system($$(SYSTEMROOT)\system32\where /q $$QMAKE_CXX) { - QMAKE_CC = $$system($$(SYSTEMROOT)\system32\where $$QMAKE_CXX) - QMAKE_CXX = $$QMAKE_CC - } - # Suppress warnings in Qt headers QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH:-I$$system_path($$[QT_HOST_PREFIX])=/imsvc $$system_path($$[QT_HOST_PREFIX])) -Fo$obj $src QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH:-I$$system_path($$[QT_HOST_PREFIX])=/imsvc $$system_path($$[QT_HOST_PREFIX])) -Fo$@ $<