Merge remote-tracking branch 'origin/2.4'

2011-12-13 15:25:20 +01:00
parent 3fc2ae7a49 007330569b
commit 9a0636f7a9
2 changed files with 6 additions and 1 deletions
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -344,7 +344,11 @@ Qt4Project::~Qt4Project()
    m_manager->unregisterProject(this);
    delete m_projectFiles;
    m_cancelEvaluate = true;
-    delete m_rootProjectNode;
+    // Deleting the root node triggers a few things, make sure rootProjectNode
+    // returns 0 already
+    Qt4ProFileNode *root = m_rootProjectNode;
+    m_rootProjectNode = 0;
+    delete root;
 }

 void Qt4Project::updateFileList()