From d1c2a841afdb06fc158f6aec5d3ccfa22fbd7af0 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Thu, 10 Nov 2016 23:19:19 -0800 Subject: Qbs: don't set cpp.linkerName This is unnecessary (and counterproductive) with automatic linker mode in Qbs 1.6. Change-Id: I808effead885eeba0d524fa27989b8a54b8c655f Reviewed-by: Eike Ziller 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 93371294fa..4026ba0ca7 100644 --- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp +++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp @@ -231,10 +231,6 @@ QVariantMap DefaultPropertyProvider::autoGeneratedProperties(const ProjectExplor } 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()); if (ProjectExplorer::GccToolChain *gcc = dynamic_cast(tc)) { diff --git a/src/plugins/qbsprojectmanager/qbsconstants.h b/src/plugins/qbsprojectmanager/qbsconstants.h index 3bdde156a0..9874209822 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"; -- cgit v1.2.1