From d1c2a841afdb06fc158f6aec5d3ccfa22fbd7af0 Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@qt.io>
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 <eike.ziller@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp')

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<ProjectExplorer::GccToolChain *>(tc)) {
-- 
cgit v1.2.1