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

Show all parameters of a makestep

Browse Source 
Show everything we pass on to make, incl. the parameters we pick up from
the Toolchain via the QtVersion.

Reviewed-by: dt
This commit is contained in:
Tobias Hunger
2011-03-14 14:39:02 +01:00
parent bf5cfde481
commit 7c1e0853a5
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,6 +103,11 @@ void MakeStep::setClean(bool clean)
m_clean = clean;
}
bool MakeStep::isClean() const
{
return m_clean;
}
QVariantMap MakeStep::toMap() const
{
QVariantMap map(ProjectExplorer::AbstractProcessStep::toMap());
@@ -163,7 +168,7 @@ bool MakeStep::init()
Utils::QtcProcess::addArgs(&args, m_userArgs);
if (!m_clean) {
if (!isClean()) {
if (!bc->defaultMakeTarget().isEmpty())
Utils::QtcProcess::addArg(&args, bc->defaultMakeTarget());
}
@@ -172,7 +177,6 @@ bool MakeStep::init()
// FIXME doing this without the user having a way to override this is rather bad
// so we only do it for unix and if the user didn't override the make command
// but for now this is the least invasive change
if (toolchain
&& toolchain->targetAbi().binaryFormat() != ProjectExplorer::Abi::PEFormat
&& m_makeCmd.isEmpty())
@@ -295,12 +299,17 @@ void MakeStepConfigWidget::updateDetails()
emit updateSummary();
return;
}
QString args = m_makeStep->userArguments();
if (!m_makeStep->isClean()) {
if (!bc->defaultMakeTarget().isEmpty())
Utils::QtcProcess::addArg(&args, bc->defaultMakeTarget());
}
// -w option enables "Enter"/"Leaving directory" messages, which we need for detecting the
// absolute file path
// FIXME doing this without the user having a way to override this is rather bad
// so we only do it for unix and if the user didn't override the make command
// but for now this is the least invasive change
QString args = m_makeStep->userArguments();
ProjectExplorer::ToolChain *toolChain = bc->toolChain();
if (toolChain
&& toolChain->targetAbi().binaryFormat() != ProjectExplorer::Abi::PEFormat