feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Remove ToolChain::defaultMakeTarget

Browse Source 
That was a Symbian specific hack.

Change-Id: I6c9ed3d4c856699ce0930aa507b3aba43ca94785
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Daniel Teske
2012-11-16 15:32:03 +01:00
parent c37420eeb3
commit cf7f778c2b
5 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/projectexplorer/toolchain.cpp
View File

@@ -133,11 +133,6 @@ bool ToolChain::canClone() const
return true; return true;
} }
QString ToolChain::defaultMakeTarget() const
{
return QString();
}
bool ToolChain::operator == (const ToolChain &tc) const bool ToolChain::operator == (const ToolChain &tc) const
{ {
if (this == &tc) if (this == &tc)

1
src/plugins/projectexplorer/toolchain.h
View File

@@ -93,7 +93,6 @@ public:
virtual QString makeCommand(const Utils::Environment &env) const = 0; virtual QString makeCommand(const Utils::Environment &env) const = 0;
virtual Utils::FileName compilerCommand() const = 0; virtual Utils::FileName compilerCommand() const = 0;
virtual QString defaultMakeTarget() const;
virtual IOutputParser *outputParser() const = 0; virtual IOutputParser *outputParser() const = 0;
virtual bool operator ==(const ToolChain &) const; virtual bool operator ==(const ToolChain &) const;

10
src/plugins/qt4projectmanager/makestep.cpp
View File

@@ -201,12 +201,6 @@ bool MakeStep::init()
} }
Utils::QtcProcess::addArgs(&args, m_userArgs); Utils::QtcProcess::addArgs(&args, m_userArgs);
if (!isClean()) {
if (!bc->defaultMakeTarget().isEmpty())
Utils::QtcProcess::addArg(&args, bc->defaultMakeTarget());
}
if (bc->fileNodeBuild() && subNode) { if (bc->fileNodeBuild() && subNode) {
QString objectsDir = subNode->objectsDirectory(); QString objectsDir = subNode->objectsDirectory();
if (objectsDir.isEmpty()) { if (objectsDir.isEmpty()) {
@@ -421,10 +415,6 @@ void MakeStepConfigWidget::updateDetails()
param.setCommand(makeCmd); param.setCommand(makeCmd);
QString args = m_makeStep->userArguments(); QString args = m_makeStep->userArguments();
if (!m_makeStep->isClean()) {
if (!bc->defaultMakeTarget().isEmpty())
Utils::QtcProcess::addArg(&args, bc->defaultMakeTarget());
}
Utils::Environment env = bc->environment(); Utils::Environment env = bc->environment();
// Force output to english for the parsers. Do this here and not in the toolchain's // Force output to english for the parsers. Do this here and not in the toolchain's

10
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
View File

@@ -286,16 +286,6 @@ void Qt4BuildConfiguration::setShadowBuildAndDirectory(bool shadowBuild, const Q
emitProFileEvaluateNeeded(); 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 QString Qt4BuildConfiguration::makefile() const
{ {
return static_cast<Qt4Project *>(target()->project())->rootQt4ProjectNode()->makefile(); return static_cast<Qt4Project *>(target()->project())->rootQt4ProjectNode()->makefile();

1
src/plugins/qt4projectmanager/qt4buildconfiguration.h
View File

@@ -86,7 +86,6 @@ public:
QMakeStep *qmakeStep() const; QMakeStep *qmakeStep() const;
MakeStep *makeStep() const; MakeStep *makeStep() const;
QString defaultMakeTarget() const;
QString makefile() const; QString makefile() const;
enum MakefileState { MakefileMatches, MakefileForWrongProject, MakefileIncompatible, MakefileMissing }; enum MakefileState { MakefileMatches, MakefileForWrongProject, MakefileIncompatible, MakefileMissing };