diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp index 12629bf29618c3e19e73ba0b7c7692f0fea7e5d8..12cbf8ab28b3dc4cb9fb45144bc1f4d4afd3d172 100644 --- a/src/plugins/qt4projectmanager/qmakestep.cpp +++ b/src/plugins/qt4projectmanager/qmakestep.cpp @@ -176,23 +176,26 @@ bool QMakeStep::init() setEnvironment(qt4bc->environment()); 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(); } void QMakeStep::run(QFutureInterface<bool> &fi) { - Qt4Project *pro = qt4BuildConfiguration()->qt4Target()->qt4Project(); - if (pro->rootProjectNode()->projectType() == ScriptTemplate) { + if (m_scriptTemplate) { fi.reportResult(true); return; } // Warn on common error conditions: - QList<ProjectExplorer::Task> issues = - qt4BuildConfiguration()->qtVersion()->reportIssues(qt4BuildConfiguration()->qt4Target()-> - qt4Project()->file()->fileName()); + bool canContinue = true; - foreach (const ProjectExplorer::Task &t, issues) { + foreach (const ProjectExplorer::Task &t, m_tasks) { addTask(t); if (t.type == Task::Error) canContinue = false; diff --git a/src/plugins/qt4projectmanager/qmakestep.h b/src/plugins/qt4projectmanager/qmakestep.h index 79156622d185e014f92a7613b98c447715df6556..bc0de0f4b9a1a5abf8ef9a7cd6ccea187e536ac8 100644 --- a/src/plugins/qt4projectmanager/qmakestep.h +++ b/src/plugins/qt4projectmanager/qmakestep.h @@ -110,6 +110,8 @@ private: bool m_forced; bool m_needToRunQMake; // set in init(), read in run() QStringList m_userArgs; + bool m_scriptTemplate; + QList<ProjectExplorer::Task> m_tasks; };