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

Make code thread safe again.

Browse Source
This commit is contained in:
dt
2010-06-09 15:08:06 +02:00
parent 273a3c14cb
commit 6dc0faceb2
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;

2
src/plugins/qt4projectmanager/qmakestep.h
View File

@@ -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;
}; };