diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp index b800a46e320..a17dc8b0b4a 100644 --- a/src/plugins/projectexplorer/toolchain.cpp +++ b/src/plugins/projectexplorer/toolchain.cpp @@ -133,11 +133,6 @@ bool ToolChain::canClone() const return true; } -QString ToolChain::defaultMakeTarget() const -{ - return QString(); -} - bool ToolChain::operator == (const ToolChain &tc) const { if (this == &tc) diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h index 3ea55bbc461..8eeae4aff90 100644 --- a/src/plugins/projectexplorer/toolchain.h +++ b/src/plugins/projectexplorer/toolchain.h @@ -93,7 +93,6 @@ public: virtual QString makeCommand(const Utils::Environment &env) const = 0; virtual Utils::FileName compilerCommand() const = 0; - virtual QString defaultMakeTarget() const; virtual IOutputParser *outputParser() const = 0; virtual bool operator ==(const ToolChain &) const; diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp index 10fecb63720..c31d64c0a03 100644 --- a/src/plugins/qt4projectmanager/makestep.cpp +++ b/src/plugins/qt4projectmanager/makestep.cpp @@ -201,12 +201,6 @@ bool MakeStep::init() } Utils::QtcProcess::addArgs(&args, m_userArgs); - - if (!isClean()) { - if (!bc->defaultMakeTarget().isEmpty()) - Utils::QtcProcess::addArg(&args, bc->defaultMakeTarget()); - } - if (bc->fileNodeBuild() && subNode) { QString objectsDir = subNode->objectsDirectory(); if (objectsDir.isEmpty()) { @@ -421,10 +415,6 @@ void MakeStepConfigWidget::updateDetails() param.setCommand(makeCmd); QString args = m_makeStep->userArguments(); - if (!m_makeStep->isClean()) { - if (!bc->defaultMakeTarget().isEmpty()) - Utils::QtcProcess::addArg(&args, bc->defaultMakeTarget()); - } Utils::Environment env = bc->environment(); // Force output to english for the parsers. Do this here and not in the toolchain's diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp index 3d0542f41cc..986751200ab 100644 --- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp @@ -286,16 +286,6 @@ void Qt4BuildConfiguration::setShadowBuildAndDirectory(bool shadowBuild, const Q emitProFileEvaluateNeeded(); } -QString Qt4BuildConfiguration::defaultMakeTarget() const -{ - ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit()); - BaseQtVersion *version = QtKitInformation::qtVersion(target()->kit()); - if (!tc || !version) - return QString(); - - return tc->defaultMakeTarget(); -} - QString Qt4BuildConfiguration::makefile() const { return static_cast(target()->project())->rootQt4ProjectNode()->makefile(); diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.h b/src/plugins/qt4projectmanager/qt4buildconfiguration.h index 4a792966135..23522555d0b 100644 --- a/src/plugins/qt4projectmanager/qt4buildconfiguration.h +++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.h @@ -86,7 +86,6 @@ public: QMakeStep *qmakeStep() const; MakeStep *makeStep() const; - QString defaultMakeTarget() const; QString makefile() const; enum MakefileState { MakefileMatches, MakefileForWrongProject, MakefileIncompatible, MakefileMissing };