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

ProjectExplorer: Fix crash on reloading projects

Browse Source 
Partially reverts 6e91fe50.

Change-Id: I91f2460fcee79deeeb55cc4955fca4726b5276bc
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Christian Stenger
2017-03-15 15:02:08 +01:00
committed by Tobias Hunger
parent 553ec77f14
commit b814bea0ab
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/project.cpp
View File

@@ -419,7 +419,7 @@ void Project::setDocument(Core::IDocument *doc)
d->m_document = doc; d->m_document = doc;
if (!d->m_rootProjectNode) { if (!d->m_rootProjectNode) {
auto newRoot = new ProjectNode(projectFilePath()); auto newRoot = new ProjectNode(projectDirectory());
newRoot->setDisplayName(displayName()); newRoot->setDisplayName(displayName());
newRoot->addNode(new FileNode(projectFilePath(), FileType::Project, false)); newRoot->addNode(new FileNode(projectFilePath(), FileType::Project, false));
setRootProjectNode(newRoot); setRootProjectNode(newRoot);

4
src/plugins/qmakeprojectmanager/qmakenodes.h
View File

@@ -69,10 +69,10 @@ public:
QmakeProFileNode *proFileNode() const; QmakeProFileNode *proFileNode() const;
protected: protected:
QmakeProject *m_project; QmakeProject *m_project = nullptr;
private: private:
QmakeProFileNode *m_qmakeProFileNode; QmakeProFileNode *m_qmakeProFileNode = nullptr;
}; };
// Implements ProjectNode for qmake .pro files // Implements ProjectNode for qmake .pro files