From 99e92dce9b4d414d5687181de4a171fb0290e156 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Thu, 20 Nov 2014 12:26:23 +0100 Subject: [PATCH] QmakeProject: Fix crash on unloading projects The QmakeVfs needs to be deleted after all evaluations have been canceled. Those are canceled in the destructors of the nodes, so delete the nodes before deleting m_qmakeVfs Task-number: QTCREATORBUG-13421 Change-Id: I5883f5b2daa6a13ef4facf9b9dccc125a069df94 Reviewed-by: Orgad Shaneh --- src/plugins/qmakeprojectmanager/qmakeproject.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index 1ca09a2293e..657f66420b1 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -376,7 +376,6 @@ QmakeProject::~QmakeProject() m_codeModelFuture.cancel(); m_asyncUpdateState = ShuttingDown; m_manager->unregisterProject(this); - delete m_qmakeVfs; delete m_projectFiles; m_cancelEvaluate = true; // Deleting the root node triggers a few things, make sure rootProjectNode @@ -385,6 +384,7 @@ QmakeProject::~QmakeProject() m_rootProjectNode = 0; delete root; Q_ASSERT(m_qmakeGlobalsRefCnt == 0); + delete m_qmakeVfs; } void QmakeProject::updateFileList()