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

Qbs: Add pointer to the project to QbsProjectNode

Browse Source 
Change-Id: I81fe083ee4350efd89c3afb3f70deb46d0409ee2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2013-05-16 16:24:37 +02:00
parent 82a341da14
commit ff778a6c88
4 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/qbsprojectmanager/qbsnodes.cpp
View File

@@ -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;

6
src/plugins/qbsprojectmanager/qbsnodes.h
View File

@@ -42,6 +42,7 @@ namespace QbsProjectManager {
namespace Internal {
class FileTreeNode;
class QbsProject;
class QbsProjectFile;
// ----------------------------------------------------------------------
@@ -166,17 +167,20 @@ class QbsProjectNode : public QbsBaseProjectNode
Q_OBJECT
public:
explicit QbsProjectNode(const QString &projectFile);
explicit QbsProjectNode(QbsProject *project);
~QbsProjectNode();
void update(const qbs::Project *prj);
QbsProject *project() const;
const qbs::Project *qbsProject() const;
const qbs::ProjectData *qbsProjectData() const;
private:
QbsProductNode *findProductNode(const QString &name);
QbsProject *m_project;
const qbs::Project *m_qbsProject;
const qbs::ProjectData *m_qbsProjectData;
static QIcon m_projectIcon;

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

@@ -100,7 +100,7 @@ QbsProject::QbsProject(QbsManager *manager, const QString &fileName) :
m_manager(manager),
m_projectName(QFileInfo(fileName).completeBaseName()),
m_fileName(fileName),
m_rootProjectNode(new QbsProjectNode(fileName)),
m_rootProjectNode(0),
m_qbsSetupProjectJob(0),
m_qbsUpdateFutureInterface(0),
m_currentBc(0)
@@ -117,6 +117,7 @@ QbsProject::QbsProject(QbsManager *manager, const QString &fileName) :
this, SLOT(targetWasAdded(ProjectExplorer::Target*)));
updateDocuments(0);
m_rootProjectNode = new QbsProjectNode(this); // needs documents to be initialized!
}
QbsProject::~QbsProject()

2
src/plugins/qbsprojectmanager/qbsproject.h
View File

@@ -129,7 +129,7 @@ private:
const QString m_projectName;
const QString m_fileName;
QSet<Core::IDocument *> m_qbsDocuments;
QbsProjectNode *const m_rootProjectNode;
QbsProjectNode *m_rootProjectNode;
qbs::SetupProjectJob *m_qbsSetupProjectJob;
QVariantMap m_qbsBuildConfig;