diff options
author | Tobias Hunger <tobias.hunger@digia.com> | 2013-05-16 16:24:37 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@digia.com> | 2013-05-17 15:08:29 +0200 |
commit | ff778a6c887ada801ab845738ce191a8d23f5ae3 (patch) | |
tree | 8ad4862c2dfe3a9b74f1ceec8a94fe4d3fe1e6a8 /src/plugins/qbsprojectmanager/qbsnodes.cpp | |
parent | 82a341da140be2743b6807899661a82e0c5f4953 (diff) | |
download | qt-creator-ff778a6c887ada801ab845738ce191a8d23f5ae3.tar.gz |
Qbs: Add pointer to the project to QbsProjectNode
Change-Id: I81fe083ee4350efd89c3afb3f70deb46d0409ee2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/plugins/qbsprojectmanager/qbsnodes.cpp')
-rw-r--r-- | src/plugins/qbsprojectmanager/qbsnodes.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsnodes.cpp b/src/plugins/qbsprojectmanager/qbsnodes.cpp index 30f25a5518..62facdf217 100644 --- a/src/plugins/qbsprojectmanager/qbsnodes.cpp +++ b/src/plugins/qbsprojectmanager/qbsnodes.cpp @@ -32,6 +32,7 @@ #include "qbsproject.h" #include <coreplugin/fileiconprovider.h> +#include <coreplugin/idocument.h> #include <qtsupport/qtsupportconstants.h> #include <utils/hostosinfo.h> #include <utils/qtcassert.h> @@ -473,17 +474,19 @@ QbsGroupNode *QbsProductNode::findGroupNode(const QString &name) // QbsProjectNode: // -------------------------------------------------------------------- -QbsProjectNode::QbsProjectNode(const QString &projectFile) : - QbsBaseProjectNode(projectFile), - m_qbsProject(0), m_qbsProjectData(0) +QbsProjectNode::QbsProjectNode(QbsProject *project) : + QbsBaseProjectNode(project->document()->fileName()), + m_project(project), m_qbsProject(0), m_qbsProjectData(0) { + Q_ASSERT(project); setIcon(m_projectIcon); addFileNodes(QList<ProjectExplorer::FileNode *>() - << new ProjectExplorer::FileNode(projectFile, ProjectExplorer::ProjectFileType, false), this); + << new ProjectExplorer::FileNode(path(), ProjectExplorer::ProjectFileType, false), this); } QbsProjectNode::~QbsProjectNode() { + // do not delete m_project delete m_qbsProjectData; delete m_qbsProject; } @@ -518,6 +521,11 @@ void QbsProjectNode::update(const qbs::Project *prj) addProjectNodes(toAdd); } +QbsProject *QbsProjectNode::project() const +{ + return m_project; +} + const qbs::Project *QbsProjectNode::qbsProject() const { return m_qbsProject; |