Skip to content
Snippets Groups Projects
Commit 6dc0face authored by dt's avatar dt
Browse files

Make code thread safe again.

parent 273a3c14
No related branches found
No related tags found
No related merge requests found
...@@ -176,23 +176,26 @@ bool QMakeStep::init() ...@@ -176,23 +176,26 @@ bool QMakeStep::init()
setEnvironment(qt4bc->environment()); setEnvironment(qt4bc->environment());
setOutputParser(new QMakeParser); setOutputParser(new QMakeParser);
Qt4Project *pro = qt4BuildConfiguration()->qt4Target()->qt4Project();
QString proFile = pro->file()->fileName();
m_tasks = qt4BuildConfiguration()->qtVersion()->reportIssues(proFile);
m_scriptTemplate = pro->rootProjectNode()->projectType() == ScriptTemplate;
return AbstractProcessStep::init(); return AbstractProcessStep::init();
} }
void QMakeStep::run(QFutureInterface<bool> &fi) void QMakeStep::run(QFutureInterface<bool> &fi)
{ {
Qt4Project *pro = qt4BuildConfiguration()->qt4Target()->qt4Project(); if (m_scriptTemplate) {
if (pro->rootProjectNode()->projectType() == ScriptTemplate) {
fi.reportResult(true); fi.reportResult(true);
return; return;
} }
// Warn on common error conditions: // Warn on common error conditions:
QList<ProjectExplorer::Task> issues =
qt4BuildConfiguration()->qtVersion()->reportIssues(qt4BuildConfiguration()->qt4Target()->
qt4Project()->file()->fileName());
bool canContinue = true; bool canContinue = true;
foreach (const ProjectExplorer::Task &t, issues) { foreach (const ProjectExplorer::Task &t, m_tasks) {
addTask(t); addTask(t);
if (t.type == Task::Error) if (t.type == Task::Error)
canContinue = false; canContinue = false;
......
...@@ -110,6 +110,8 @@ private: ...@@ -110,6 +110,8 @@ private:
bool m_forced; bool m_forced;
bool m_needToRunQMake; // set in init(), read in run() bool m_needToRunQMake; // set in init(), read in run()
QStringList m_userArgs; QStringList m_userArgs;
bool m_scriptTemplate;
QList<ProjectExplorer::Task> m_tasks;
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment