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

Qbs: Fix memory leak in Qbs Project Manager

Browse Source 
Make sure the root node of the project tree is actually deleted.

Change-Id: Idf32460d7b5d0518da9536084cccb074638cfce3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2013-10-21 17:43:10 +02:00
parent 5686f5fd70
commit 9dd656914a
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -114,6 +114,8 @@ QbsProject::QbsProject(QbsManager *manager, const QString &fileName) :
connect(&m_parsingDelay, SIGNAL(timeout()), this, SLOT(parseCurrentBuildConfiguration())); connect(&m_parsingDelay, SIGNAL(timeout()), this, SLOT(parseCurrentBuildConfiguration()));
updateDocuments(QSet<QString>() << fileName); updateDocuments(QSet<QString>() << fileName);
// NOTE: QbsProjectNode does not use this as a parent!
m_rootProjectNode = new QbsProjectNode(this); // needs documents to be initialized! m_rootProjectNode = new QbsProjectNode(this); // needs documents to be initialized!
} }
@@ -125,6 +127,12 @@ QbsProject::~QbsProject()
m_qbsSetupProjectJob->cancel(); m_qbsSetupProjectJob->cancel();
delete m_qbsSetupProjectJob; delete m_qbsSetupProjectJob;
} }
// Deleting the root node triggers a few things, make sure rootProjectNode
// returns 0 already
QbsProjectNode *root = m_rootProjectNode;
m_rootProjectNode = 0;
delete root;
} }
QString QbsProject::displayName() const QString QbsProject::displayName() const