Commit b96d7b9b authored by Daniel Teske's avatar Daniel Teske
Browse files

Make Qt4ProejctManager::MakeStep::run multithreading safe

Change-Id: I416360d35681d2721878cb9fefd861d6e1f209b4
Reviewed-on: http://codereview.qt-project.org/5451

Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent e1b275c0
......@@ -152,6 +152,11 @@ ProjectExplorer::IOutputParser *AbstractProcessStep::outputParser() const
return m_outputParserChain;
}
bool AbstractProcessStep::ignoreReturnValue()
{
return m_ignoreReturnValue;
}
/*!
\brief If ignoreReturnValue is set to true, then the abstractprocess step will
return success even if the return value indicates otherwise.
......
......@@ -68,12 +68,12 @@ public:
ProcessParameters *processParameters() { return &m_param; }
bool ignoreReturnValue();
void setIgnoreReturnValue(bool b);
void setOutputParser(ProjectExplorer::IOutputParser *parser);
void appendOutputParser(ProjectExplorer::IOutputParser *parser);
ProjectExplorer::IOutputParser *outputParser() const;
protected:
AbstractProcessStep(BuildStepList *bsl, const QString &id);
AbstractProcessStep(BuildStepList *bsl, AbstractProcessStep *bs);
......
......@@ -229,9 +229,9 @@ void MakeStep::run(QFutureInterface<bool> & fi)
}
if (!QFileInfo(m_makeFileToCheck).exists()) {
if (!m_clean)
if (!ignoreReturnValue())
emit addOutput(tr("Cannot find Makefile. Check your build settings."), BuildStep::MessageOutput);
fi.reportResult(m_clean);
fi.reportResult(ignoreReturnValue());
return;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment