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

QmlDump: Avoid crash when removing project during rebuild.

Browse Source
This commit is contained in:
Christian Kamm
2011-02-24 09:34:19 +01:00
parent d90d6729ad
commit c2e180db76
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/qt4projectmanager/qmldumptool.cpp
View File

@@ -83,9 +83,17 @@ public:
m_buildTask->run(future); m_buildTask->run(future);
} }
void updateProjectWhenDone(ProjectExplorer::Project *project, bool preferDebug) void updateProjectWhenDone(QPointer<ProjectExplorer::Project> project, bool preferDebug)
{ {
m_projectsToUpdate.insert(qMakePair(project, preferDebug)); foreach (const ProjectToUpdate &update, m_projectsToUpdate) {
if (update.project == project)
return;
}
ProjectToUpdate update;
update.project = project;
update.preferDebug = preferDebug;
m_projectsToUpdate += update;
} }
bool hasFailed() const bool hasFailed() const
@@ -123,12 +131,13 @@ private slots:
if (!modelManager) if (!modelManager)
return; return;
typedef QPair<ProjectExplorer::Project *, bool> ProjectAndDebug; foreach (const ProjectToUpdate &update, m_projectsToUpdate) {
foreach (ProjectAndDebug projectAndDebug, m_projectsToUpdate) { if (!update.project)
QmlJS::ModelManagerInterface::ProjectInfo projectInfo = modelManager->projectInfo(projectAndDebug.first); continue;
projectInfo.qmlDumpPath = version->qmlDumpTool(projectAndDebug.second); QmlJS::ModelManagerInterface::ProjectInfo projectInfo = modelManager->projectInfo(update.project);
projectInfo.qmlDumpPath = version->qmlDumpTool(update.preferDebug);
if (projectInfo.qmlDumpPath.isEmpty()) if (projectInfo.qmlDumpPath.isEmpty())
projectInfo.qmlDumpPath = version->qmlDumpTool(!projectAndDebug.second); projectInfo.qmlDumpPath = version->qmlDumpTool(!update.preferDebug);
projectInfo.qmlDumpEnvironment = version->qmlToolsEnvironment(); projectInfo.qmlDumpEnvironment = version->qmlToolsEnvironment();
modelManager->updateProjectInfo(projectInfo); modelManager->updateProjectInfo(projectInfo);
} }
@@ -139,7 +148,13 @@ private slots:
} }
private: private:
QSet<QPair<ProjectExplorer::Project *, bool> > m_projectsToUpdate; class ProjectToUpdate {
public:
QPointer<ProjectExplorer::Project> project;
bool preferDebug;
};
QList<ProjectToUpdate> m_projectsToUpdate;
Internal::DebuggingHelperBuildTask *m_buildTask; // deletes itself after run() Internal::DebuggingHelperBuildTask *m_buildTask; // deletes itself after run()
QtVersion m_version; QtVersion m_version;
bool m_failed; bool m_failed;