diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
index 336ee55b6af..f3e6badb4d8 100644
--- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
+++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
@@ -230,13 +230,23 @@ QVariantMap DefaultPropertyProvider::autoGeneratedProperties(const ProjectExplor
     const QString toolchainPrefix = extractToolchainPrefix(&compilerName);
     if (!toolchainPrefix.isEmpty())
         data.insert(QLatin1String(CPP_TOOLCHAINPREFIX), toolchainPrefix);
-    data.insert(QLatin1String(CPP_CXXCOMPILERNAME), compilerName);
+    if (toolchain.contains(QLatin1String("msvc")))
+        data.insert(QLatin1String(CPP_COMPILERNAME), compilerName);
+    else
+        data.insert(QLatin1String(CPP_CXXCOMPILERNAME), compilerName);
     if (targetAbi.os() != ProjectExplorer::Abi::WindowsOS
             || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor) {
         data.insert(QLatin1String(CPP_LINKERNAME), compilerName);
     }
     data.insert(QLatin1String(CPP_TOOLCHAINPATH), cxxFileInfo.absolutePath());
 
+    // 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 666a7dc5773..b9ad484e443 100644
--- a/src/plugins/qbsprojectmanager/qbsconstants.h
+++ b/src/plugins/qbsprojectmanager/qbsconstants.h
@@ -41,8 +41,11 @@ const char QBS_ARCHITECTURE[] = "qbs.architecture";
 const char QBS_TOOLCHAIN[] = "qbs.toolchain";
 const char CPP_TOOLCHAINPATH[] = "cpp.toolchainInstallPath";
 const char CPP_TOOLCHAINPREFIX[] = "cpp.toolchainPrefix";
+const char CPP_COMPILERNAME[] = "cpp.compilerName";
 const char CPP_CXXCOMPILERNAME[] = "cpp.cxxCompilerName";
 const char CPP_LINKERNAME[] = "cpp.linkerName";
+const char CPP_PLATFORMCFLAGS[] = "cpp.platformCFlags";
+const char CPP_PLATFORMCXXFLAGS[] = "cpp.platformCxxFlags";
 const char CPP_PLATFORMPATH[] = "cpp.platformPath";
 const char CPP_XCODESDKNAME[] = "cpp.xcodeSdkName";
 const char CPP_XCODESDKVERSION[] = "cpp.xcodeSdkVersion";