From 6776b7865597ba6082678551bed319574896ad2e Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Thu, 11 Aug 2016 13:33:23 -0700 Subject: [PATCH] Revert "QbsProjectManager: Write MSVC compiler version to profile" This reverts commit 3c63b621d9adc621aed227b1154fa36b7c765992. This is no longer necessary because Qbs determines the version automatically. Change-Id: I80161ddf366091eca8bb1e1b29657371e9a7b0fb Reviewed-by: Christian Kandeler --- .../defaultpropertyprovider.cpp | 16 ---------------- src/plugins/qbsprojectmanager/qbsconstants.h | 3 --- 2 files changed, 19 deletions(-) diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp index cdf5d6bd217..32e116f3637 100644 --- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp +++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp @@ -158,19 +158,6 @@ QVariantMap DefaultPropertyProvider::properties(const ProjectExplorer::Kit *k, return data; } -struct MSVCVersion -{ - int major = 0; - int minor = 0; -}; - -static MSVCVersion msvcCompilerVersion(const ProjectExplorer::Abi &abi) -{ - MSVCVersion v; - v.major = abi.osFlavor() - ProjectExplorer::Abi::WindowsMsvc2005Flavor + 14; - return v; -} - QVariantMap DefaultPropertyProvider::autoGeneratedProperties(const ProjectExplorer::Kit *k, const QVariantMap &defaultData) const { @@ -275,9 +262,6 @@ QVariantMap DefaultPropertyProvider::autoGeneratedProperties(const ProjectExplor if (toolchain.contains(QLatin1String("msvc"))) { data.insert(QLatin1String(CPP_COMPILERNAME), mainCompilerName); - const MSVCVersion v = msvcCompilerVersion(targetAbi); - data.insert(QLatin1String(CPP_COMPILERVERSIONMAJOR), v.major); - data.insert(QLatin1String(CPP_COMPILERVERSIONMINOR), v.minor); } else { data.insert(QLatin1String(CPP_COMPILERNAME), cCompilerName); data.insert(QLatin1String(CPP_CXXCOMPILERNAME), cxxCompilerName); diff --git a/src/plugins/qbsprojectmanager/qbsconstants.h b/src/plugins/qbsprojectmanager/qbsconstants.h index ba77740f6e2..8ed4ace4a61 100644 --- a/src/plugins/qbsprojectmanager/qbsconstants.h +++ b/src/plugins/qbsprojectmanager/qbsconstants.h @@ -37,9 +37,6 @@ 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_COMPILERVERSIONMAJOR[] = "cpp.compilerVersionMajor"; -const char CPP_COMPILERVERSIONMINOR[] = "cpp.compilerVersionMinor"; -const char CPP_COMPILERVERSIONPATCH[] = "cpp.compilerVersionPatch"; const char CPP_PLATFORMCOMMONCOMPILERFLAGS[] = "cpp.platformCommonCompilerFlags"; const char CPP_PLATFORMLINKERFLAGS[] = "cpp.platformLinkerFlags"; const char CPP_PLATFORMPATH[] = "cpp.platformPath";