From 1c04cce4d7e7f615f1876004c62f8f1ed620a598 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Fri, 13 May 2016 23:12:31 -0700 Subject: [PATCH] Remove unnecessary /FS flag in qbs property provider. The current version of qbs handles this automatically. Change-Id: I81905335fd3366198164436e7125944ad8a3d304 Reviewed-by: Christian Kandeler --- src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp | 7 ------- src/plugins/qbsprojectmanager/qbsconstants.h | 2 -- 2 files changed, 9 deletions(-) diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp index c947212c0ba..6ff49324ec5 100644 --- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp +++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp @@ -261,13 +261,6 @@ QVariantMap DefaultPropertyProvider::autoGeneratedProperties(const ProjectExplor data.insert(QLatin1String(CPP_PLATFORMLINKERFLAGS), gcc->platformLinkerFlags()); } - // TODO: Remove this once compiler version properties are set for MSVC - if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2013Flavor - || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2015Flavor) { - const QLatin1String flags("/FS"); - data.insert(QLatin1String(CPP_PLATFORMCFLAGS), flags); - data.insert(QLatin1String(CPP_PLATFORMCXXFLAGS), flags); - } return data; } diff --git a/src/plugins/qbsprojectmanager/qbsconstants.h b/src/plugins/qbsprojectmanager/qbsconstants.h index 0fc030f8471..1f1897d4efd 100644 --- a/src/plugins/qbsprojectmanager/qbsconstants.h +++ b/src/plugins/qbsprojectmanager/qbsconstants.h @@ -42,8 +42,6 @@ const char CPP_COMPILERVERSIONMAJOR[] = "cpp.compilerVersionMajor"; const char CPP_COMPILERVERSIONMINOR[] = "cpp.compilerVersionMinor"; const char CPP_COMPILERVERSIONPATCH[] = "cpp.compilerVersionPatch"; const char CPP_LINKERNAME[] = "cpp.linkerName"; -const char CPP_PLATFORMCFLAGS[] = "cpp.platformCFlags"; -const char CPP_PLATFORMCXXFLAGS[] = "cpp.platformCxxFlags"; const char CPP_PLATFORMCOMMONCOMPILERFLAGS[] = "cpp.platformCommonCompilerFlags"; const char CPP_PLATFORMLINKERFLAGS[] = "cpp.platformLinkerFlags"; const char CPP_PLATFORMPATH[] = "cpp.platformPath";