From ac19d0691d240987ea2db3fa93da2f21ec143b07 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Mon, 25 Jul 2016 18:06:44 -0700 Subject: [PATCH] Don't set cpp.linkerName for Qbs kits This is unnecessary now that Qbs handles the linker automatically. Change-Id: I8c6270f74355bfa274717a7791daf8d1f4721e00 Reviewed-by: Christian Kandeler --- src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp | 4 ---- src/plugins/qbsprojectmanager/qbsconstants.h | 1 - 2 files changed, 5 deletions(-) diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp index 634fd05b592..cdf5d6bd217 100644 --- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp +++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp @@ -282,10 +282,6 @@ QVariantMap DefaultPropertyProvider::autoGeneratedProperties(const ProjectExplor data.insert(QLatin1String(CPP_COMPILERNAME), cCompilerName); data.insert(QLatin1String(CPP_CXXCOMPILERNAME), cxxCompilerName); } - if (targetAbi.os() != ProjectExplorer::Abi::WindowsOS - || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor) { - data.insert(QLatin1String(CPP_LINKERNAME), mainCompilerName); - } if (tcC && tcCxx && cFileInfo.absolutePath() != cxxFileInfo.absolutePath()) { Core::MessageManager::write(tr("C and C++ compiler paths differ. C compiler may not work."), diff --git a/src/plugins/qbsprojectmanager/qbsconstants.h b/src/plugins/qbsprojectmanager/qbsconstants.h index dbcf3e76f79..ba77740f6e2 100644 --- a/src/plugins/qbsprojectmanager/qbsconstants.h +++ b/src/plugins/qbsprojectmanager/qbsconstants.h @@ -40,7 +40,6 @@ 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_LINKERNAME[] = "cpp.linkerName"; const char CPP_PLATFORMCOMMONCOMPILERFLAGS[] = "cpp.platformCommonCompilerFlags"; const char CPP_PLATFORMLINKERFLAGS[] = "cpp.platformLinkerFlags"; const char CPP_PLATFORMPATH[] = "cpp.platformPath";