diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
index 11e25e309f1..336ee55b6af 100644
--- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
+++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
@@ -230,41 +230,13 @@ QVariantMap DefaultPropertyProvider::autoGeneratedProperties(const ProjectExplor
     const QString toolchainPrefix = extractToolchainPrefix(&compilerName);
     if (!toolchainPrefix.isEmpty())
         data.insert(QLatin1String(CPP_TOOLCHAINPREFIX), toolchainPrefix);
-    data.insert(QLatin1String(CPP_COMPILERNAME), compilerName);
+    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());
 
-    QVariantMap m;
-    if (toolchain.contains(QLatin1String("clang"))) {
-        m[QLatin1String("c")] = m[QLatin1String("objc")] = QLatin1String("clang");
-        m[QLatin1String("cpp")] = m[QLatin1String("objcpp")] = QLatin1String("clang++");
-    } else if (toolchain.contains(QLatin1String("gcc"))) {
-        m[QLatin1String("c")] = m[QLatin1String("objc")] = QLatin1String("gcc");
-        m[QLatin1String("cpp")] = m[QLatin1String("objcpp")] = QLatin1String("g++");
-    }
-    const QString fullPrefix = cxxFileInfo.absolutePath() + QLatin1Char('/') + toolchainPrefix;
-    for (auto it = m.begin(); it != m.end();) {
-        const QString filePath = Utils::HostOsInfo::withExecutableSuffix(fullPrefix
-                                                                         + it.value().toString());
-        if (QFile::exists(filePath)) {
-            it.value() = filePath;
-            ++it;
-        } else {
-            it = m.erase(it);
-        }
-    }
-    if (!m.isEmpty())
-        data.insert(QLatin1String(CPP_COMPILERPATHBYLANGUAGE), m);
-
-    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 0f76d4963df..666a7dc5773 100644
--- a/src/plugins/qbsprojectmanager/qbsconstants.h
+++ b/src/plugins/qbsprojectmanager/qbsconstants.h
@@ -38,15 +38,11 @@ namespace Constants {
 const char QBS_TARGETOS[] = "qbs.targetOS";
 const char QBS_SYSROOT[] = "qbs.sysroot";
 const char QBS_ARCHITECTURE[] = "qbs.architecture";
-const char QBS_ENDIANNESS[] = "qbs.endianness";
 const char QBS_TOOLCHAIN[] = "qbs.toolchain";
 const char CPP_TOOLCHAINPATH[] = "cpp.toolchainInstallPath";
-const char CPP_COMPILERPATHBYLANGUAGE[] = "cpp.compilerPathByLanguage";
 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";
diff --git a/src/shared/qbs b/src/shared/qbs
index b24c37c89f7..2867e2712e4 160000
--- a/src/shared/qbs
+++ b/src/shared/qbs
@@ -1 +1 @@
-Subproject commit b24c37c89f7db5363f4860ba269dba482b19a5f1
+Subproject commit 2867e2712e4c03308e4be76821d788c06bac565e