From 3cb00e1afec33843105179cd289bb2178cd735a4 Mon Sep 17 00:00:00 2001 From: Yuchen Deng Date: Fri, 18 Apr 2014 10:00:52 +0800 Subject: [PATCH] Add /FS to cpp.platformC(xx)Flags for MSVC2013 Task-number: QTCREATORBUG-11025 Change-Id: Ibdfebc601a38535aae353a0ed2aedac920d5b192 Reviewed-by: Joerg Bornemann --- src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp | 5 +++++ src/plugins/qbsprojectmanager/qbsconstants.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp index 28b0ad3158a..af81b1aa4f2 100644 --- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp +++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp @@ -118,6 +118,11 @@ QVariantMap DefaultPropertyProvider::properties(const ProjectExplorer::Kit *k, c Utils::FileName cxx = tc->compilerCommand(); data.insert(QLatin1String(CPP_TOOLCHAINPATH), cxx.toFileInfo().absolutePath()); data.insert(QLatin1String(CPP_COMPILERNAME), cxx.toFileInfo().fileName()); + if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2013Flavor) { + 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 40f8f4767d3..878b95d98a1 100644 --- a/src/plugins/qbsprojectmanager/qbsconstants.h +++ b/src/plugins/qbsprojectmanager/qbsconstants.h @@ -41,6 +41,8 @@ const char QBS_ENDIANNESS[] = "qbs.endianness"; const char QBS_TOOLCHAIN[] = "qbs.toolchain"; const char CPP_TOOLCHAINPATH[] = "cpp.toolchainInstallPath"; const char CPP_COMPILERNAME[] = "cpp.compilerName"; +const char CPP_PLATFORMCFLAGS[] = "cpp.platformCFlags"; +const char CPP_PLATFORMCXXFLAGS[] = "cpp.platformCxxFlags"; } // namespace Constants } // namespace QbsProjectManager